summaryrefslogtreecommitdiffstats
path: root/fs/xfs/quota
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2010-06-04 20:22:30 +0200
committerAlex Elder <aelder@sgi.com>2010-06-04 20:22:30 +0200
commit1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch)
treefdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/quota
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentxfs: improve xfs_isilocked (diff)
downloadlinux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.xz
linux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/quota')
-rw-r--r--fs/xfs/quota/xfs_qm.c4
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(
if (!xfs_Gqm) {
xfs_Gqm = xfs_Gqm_init();
- if (!xfs_Gqm)
+ if (!xfs_Gqm) {
+ mutex_unlock(&xfs_Gqm_lock);
return ENOMEM;
+ }
}
/*