Merge branch 'master' into for-linus

[pandora-kernel.git] / fs / xfs / quota / xfs_qm.c

diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 38e7641..2d8b7bc 100644 (file)
--- 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;
+               }
        }
 
        /*