From 9765ad45db14bd72201489c20ab51a065f379779 Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov Date: Mon, 8 Nov 2010 13:47:33 -0500 Subject: [PATCH] --- yaml --- r: 221699 b: refs/heads/master c: 87009d86dc045d228e21242467a67a5f99347553 h: refs/heads/master i: 221697: c87216b0b69533175f0251b626b98ad53ef75dd3 221695: b5656fafc1b8fd2a08b51f138033a12144491414 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6ffd736beb46..04fde2ee2607 100644 --- 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 index 45653af88953..ee91e29ddf95 100644 --- 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); }