From bce91360d23f05a10b708c070c89383b382816b8 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 27 Jul 2010 11:56:07 -0400
Subject: [PATCH] --- yaml --- r: 206311 b: refs/heads/master c:
 62d2b5f2dcd3707b070efb16bbfdf6947c38c194 h: refs/heads/master i:   206309:
 223753d9836f86ee272fb877c5abad840550448d   206307:
 4fa0554ee46c73dd5e4d0ec276f07d22b99ce159   206303:
 dc639c1588c56b37cc204a0b1f25f2b81e2f95ac v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/super.c | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index ec461efb7dde..bcb49e16daba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc7dae3cb21184a317f10a12250bd8d6f458077
+refs/heads/master: 62d2b5f2dcd3707b070efb16bbfdf6947c38c194
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index d573f6c1a4de..c1036bc8a539 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -4138,7 +4138,6 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 	ext4_lblk_t blk = off >> EXT4_BLOCK_SIZE_BITS(sb);
 	int err = 0;
 	int offset = off & (sb->s_blocksize - 1);
-	int journal_quota = EXT4_SB(sb)->s_qf_names[type] != NULL;
 	struct buffer_head *bh;
 	handle_t *handle = journal_current_handle();
 
@@ -4163,24 +4162,16 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 	bh = ext4_bread(handle, inode, blk, 1, &err);
 	if (!bh)
 		goto out;
-	if (journal_quota) {
-		err = ext4_journal_get_write_access(handle, bh);
-		if (err) {
-			brelse(bh);
-			goto out;
-		}
+	err = ext4_journal_get_write_access(handle, bh);
+	if (err) {
+		brelse(bh);
+		goto out;
 	}
 	lock_buffer(bh);
 	memcpy(bh->b_data+offset, data, len);
 	flush_dcache_page(bh->b_page);
 	unlock_buffer(bh);
-	if (journal_quota)
-		err = ext4_handle_dirty_metadata(handle, NULL, bh);
-	else {
-		/* Always do at least ordered writes for quotas */
-		err = ext4_jbd2_file_inode(handle, inode);
-		mark_buffer_dirty(bh);
-	}
+	err = ext4_handle_dirty_metadata(handle, NULL, bh);
 	brelse(bh);
 out:
 	if (err) {