linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wang shilong <wangshilong1991@gmail.com>
To: jack@suse.cz
Cc: linux-ext4@vger.kernel.org,
	Wang shilong <wangshilong1991@gmail.com>,
	Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Subject: [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called
Date: Wed,  6 Feb 2013 14:14:27 +0800	[thread overview]
Message-ID: <1360131268-1615-2-git-send-email-wangshilong1991@gmail.com> (raw)
In-Reply-To: <1360131268-1615-1-git-send-email-wangshilong1991@gmail.com>

From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>

We should mark inode dirty after the function dquot_free_block_nodirty
is called.Besides,add a check whether it is necessary to call
dquot_free_block_nodirty functon.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
---
 fs/ext2/balloc.c | 15 ++++++++++-----
 fs/ext2/xattr.c  |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 22993a0..9d372bf 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -568,8 +568,11 @@ do_more:
 	}
 error_return:
 	brelse(bitmap_bh);
-	release_blocks(sb, freed);
-	dquot_free_block_nodirty(inode, freed);
+	if (freed) {
+		release_blocks(sb, freed);
+		dquot_free_block_nodirty(inode, freed);
+		mark_inode_dirty(inode);
+	}
 }
 
 /**
@@ -1412,9 +1415,11 @@ allocated:
 
 	*errp = 0;
 	brelse(bitmap_bh);
-	dquot_free_block_nodirty(inode, *count-num);
-	mark_inode_dirty(inode);
-	*count = num;
+	if (num < *count) {
+		dquot_free_block_nodirty(inode, *count-num);
+		mark_inode_dirty(inode);
+		*count = num;
+	}
 	return ret_block;
 
 io_error:
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index b6754db..4c4cda9 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -795,6 +795,7 @@ ext2_xattr_delete_inode(struct inode *inode)
 		if (IS_SYNC(inode))
 			sync_dirty_buffer(bh);
 		dquot_free_block_nodirty(inode, 1);
+		mark_inode_dirty(inode);
 	}
 	EXT2_I(inode)->i_file_acl = 0;
 
-- 
1.7.11.7


  reply	other threads:[~2013-02-06  6:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-06  6:14 [PATCH 1/3] Ext2: remove the overhead check about sb in the function ext2_new_blocks Wang shilong
2013-02-06  6:14 ` Wang shilong [this message]
2013-02-06 12:44   ` [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Jan Kara
2013-02-06  6:14 ` [PATCH 3/3] Ext2: remove the static function release_blocks to optimize the kernel Wang shilong
2013-02-06 12:48   ` Jan Kara
2013-02-06 12:46 ` [PATCH 1/3] Ext2: remove the overhead check about sb in the function ext2_new_blocks Jan Kara
  -- strict thread matches above, loose matches on Subject: below --
2013-02-06 20:02 [PATCH 2/3] Ext2: mark inode dirty after the function dquot_free_block_nodirty is called Wang Shilong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360131268-1615-2-git-send-email-wangshilong1991@gmail.com \
    --to=wangshilong1991@gmail.com \
    --cc=jack@suse.cz \
    --cc=linux-ext4@vger.kernel.org \
    --cc=wangsl-fnst@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).