diff options
| author | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
| commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
| tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/quota | |
| parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
| parent | f9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/quota')
| -rw-r--r-- | fs/xfs/quota/xfs_qm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 38e764146644..2d8b7bc792c9 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
| @@ -249,8 +249,10 @@ xfs_qm_hold_quotafs_ref( | |||
| 249 | 249 | ||
| 250 | if (!xfs_Gqm) { | 250 | if (!xfs_Gqm) { |
| 251 | xfs_Gqm = xfs_Gqm_init(); | 251 | xfs_Gqm = xfs_Gqm_init(); |
| 252 | if (!xfs_Gqm) | 252 | if (!xfs_Gqm) { |
| 253 | mutex_unlock(&xfs_Gqm_lock); | ||
| 253 | return ENOMEM; | 254 | return ENOMEM; |
| 255 | } | ||
| 254 | } | 256 | } |
| 255 | 257 | ||
| 256 | /* | 258 | /* |