diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 06:05:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 06:05:17 -0500 |
| commit | ab5c5f639bba89d1103deae447836edf41e37659 (patch) | |
| tree | f7e619c425975e0a022ba2ff2449bf2ce8b6cca4 | |
| parent | Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| parent | MAINTAINERS: update XFS maintainer entry (diff) | |
| download | linux-dev-ab5c5f639bba89d1103deae447836edf41e37659.tar.xz linux-dev-ab5c5f639bba89d1103deae447836edf41e37659.zip | |
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()
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | fs/xfs/xfs_qm.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 78751bbfa91a..48fe11cc2306 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7436,7 +7436,8 @@ F: drivers/xen/*swiotlb* XFS FILESYSTEM P: Silicon Graphics Inc -M: Alex Elder <aelder@sgi.com> +M: Ben Myers <bpm@sgi.com> +M: Alex Elder <elder@kernel.org> M: xfs-masters@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 5cff443f6cdb..0bbb1a41998b 100644 --- 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; |