From edfd7b5cdb866ccb4b84be7b32d849a6b70569e8 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 10 Oct 2011 18:32:06 +0200
Subject: [PATCH] --- yaml --- r: 273085 b: refs/heads/master c:
 0aaa618863c40e86b543debe002d6f65ff5d61d4 h: refs/heads/master i:   273083:
 80739dc54fcca997961eb542f6db1f4a2546242b v: v3

---
 [refs]                 | 2 +-
 trunk/fs/quota/quota.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1006ecb83766..ecc97f7098e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a983f368f8986c1ecb64f2947fcf594343130215
+refs/heads/master: 0aaa618863c40e86b543debe002d6f65ff5d61d4
diff --git a/trunk/fs/quota/quota.c b/trunk/fs/quota/quota.c
index b34bdb25490c..a18ef461a5ba 100644
--- a/trunk/fs/quota/quota.c
+++ b/trunk/fs/quota/quota.c
@@ -363,12 +363,15 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
 	}
 
 	sb = quotactl_block(special);
-	if (IS_ERR(sb))
-		return PTR_ERR(sb);
+	if (IS_ERR(sb)) {
+		ret = PTR_ERR(sb);
+		goto out;
+	}
 
 	ret = do_quotactl(sb, type, cmds, id, addr, pathp);
 
 	drop_super(sb);
+out:
 	if (pathp && !IS_ERR(pathp))
 		path_put(pathp);
 	return ret;