ext4: do not try to grab the s_umount semaphore in ext4_quota_off

Dmitry Monakhov · tytso · commit 87009d86dc04 · 2010-11-08T13:47:33.000-05:00
It's not needed to sync the filesystem, and it fixes a lock_dep complaint.

Signed-off-by: Dmitry Monakhov &lt;dmonakhov@gmail.com&gt;
Signed-off-by: "Theodore Ts'o" &lt;tytso@mit.edu&gt;
Reviewed-by: Jan Kara &lt;jack@suse.cz&gt;
diff --git a/fs/ext4/super.c b/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);
 }

Original file line number	Diff line number	Diff line change
`@@ -4570,12 +4570,10 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,`
`4570`	`4570`
`4571`	`4571`	`static int ext4_quota_off(struct super_block *sb, int type)`
`4572`	`4572`	`{`
`4573`		`- /* Force all delayed allocation blocks to be allocated */`
`4574`		`- if (test_opt(sb, DELALLOC)) {`
`4575`		`- down_read(&sb->s_umount);`
	`4573`	`+ /* Force all delayed allocation blocks to be allocated.`
	`4574`	`+ * Caller already holds s_umount sem */`
	`4575`	`+ if (test_opt(sb, DELALLOC))`
`4576`	`4576`	`sync_filesystem(sb);`
`4577`		`- up_read(&sb->s_umount);`
`4578`		`- }`
`4579`	`4577`
`4580`	`4578`	`return dquot_quota_off(sb, type);`
`4581`	`4579`	`}`