---

yaml --- r: 221699 b: refs/heads/master c: 87009d8 h: refs/heads/master i: 221697: c87216b 221695: b5656fa v: v3
git-mirror · Nov 8, 2010 · 9765ad4 · 9765ad4
1 parent 222cc84
commit 9765ad4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83668e7141c7a0aa4035bde94344b81f9cf966ab
+refs/heads/master: 87009d86dc045d228e21242467a67a5f99347553
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
@@ -4570,12 +4570,10 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 
 static int ext4_quota_off(struct super_block *sb, int type)
 {
-	/* Force all delayed allocation blocks to be allocated */
-	if (test_opt(sb, DELALLOC)) {
-		down_read(&sb->s_umount);
+	/* Force all delayed allocation blocks to be allocated.
+	 * Caller already holds s_umount sem */
+	if (test_opt(sb, DELALLOC))
 		sync_filesystem(sb);
-		up_read(&sb->s_umount);
-	}
 
 	return dquot_quota_off(sb, type);
 }