diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 15:05:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 15:05:17 +0400 |
| commit | ab5c5f639bba89d1103deae447836edf41e37659 (patch) | |
| tree | f7e619c425975e0a022ba2ff2449bf2ce8b6cca4 /fs | |
| parent | c5e0c7825d3a14c2dfc383763393f0bcb5400aa6 (diff) | |
| parent | c8891329131f791e0ddc422eaf6fc86e9a8cf8f5 (diff) | |
| download | linux-ab5c5f639bba89d1103deae447836edf41e37659.tar.xz | |
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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_qm.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |