aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2010-11-08 13:47:33 -0500
committerTheodore Ts'o <tytso@mit.edu>2010-11-08 13:47:33 -0500
commit87009d86dc045d228e21242467a67a5f99347553 (patch)
tree2c24052844da18e7a736680b5af9ea97581cebd0
parentext4: fix potential race when freeing ext4_io_page structures (diff)
downloadlinux-dev-87009d86dc045d228e21242467a67a5f99347553.tar.xz
linux-dev-87009d86dc045d228e21242467a67a5f99347553.zip
ext4: do not try to grab the s_umount semaphore in ext4_quota_off
It's not needed to sync the filesystem, and it fixes a lock_dep complaint. Signed-off-by: Dmitry Monakhov <dmonakhov@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/ext4/super.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 45653af88953..ee91e29ddf95 100644
--- 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);
}