Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs: MAINTAINERS: update XFS maintainer entry xfs: use doalloc flag in xfs_qm_dqattach_one()
juan-gutierrez · Nov 19, 2011 · ab5c5f6 · ab5c5f6
2 parents c5e0c78 + c889132
commit ab5c5f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -7436,7 +7436,8 @@ F:	drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-M:	Alex Elder <[email protected]>
+M:	Ben Myers <[email protected]>
+M:	Alex Elder <[email protected]>
 M:	[email protected]
 L:	[email protected]
 W:	http://oss.sgi.com/projects/xfs

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
@@ -674,7 +674,8 @@ xfs_qm_dqattach_one(
 	 * disk and we didn't ask it to allocate;
 	 * ESRCH if quotas got turned off suddenly.
 	 */
-	error = xfs_qm_dqget(ip->i_mount, ip, id, type, XFS_QMOPT_DOWARN, &dqp);
+	error = xfs_qm_dqget(ip->i_mount, ip, id, type,
+			     doalloc | XFS_QMOPT_DOWARN, &dqp);
 	if (error)
 		return error;