linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
To: tytso@mit.edu
Cc: linux-ext4@vger.kernel.org, Yongqiang Yang <xiaoqiangnk@gmail.com>
Subject: [PATCH 2/5] ext4: let ext4 journal deletion of data blocks
Date: Tue, 15 Nov 2011 16:07:51 +0800	[thread overview]
Message-ID: <1321344474-14707-2-git-send-email-xiaoqiangnk@gmail.com> (raw)
In-Reply-To: <1321344474-14707-1-git-send-email-xiaoqiangnk@gmail.com>

This patch lets ext4 journal deletion of data blocks. Besides this,
a unnecessary variable is removed.

Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
---
 fs/ext4/mballoc.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index e2d8be8..2529efc 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4562,19 +4562,16 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
 	trace_ext4_free_blocks(inode, block, count, flags);
 
 	if (flags & EXT4_FREE_BLOCKS_FORGET) {
-		struct buffer_head *tbh = bh;
 		int i;
 
 		BUG_ON(bh && (count > 1));
 
 		for (i = 0; i < count; i++) {
 			if (!bh)
-				tbh = sb_find_get_block(inode->i_sb,
+				bh = sb_find_get_block(inode->i_sb,
 							block + i);
-			if (unlikely(!tbh))
-				continue;
 			ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA,
-				    inode, tbh, block + i);
+				    inode, bh, block + i);
 		}
 	}
 
-- 
1.7.5.1


  reply	other threads:[~2011-11-15 10:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-15  8:07 [PATCH 1/5] ext4: allocate delalloc blocks before changing journal mode Yongqiang Yang
2011-11-15  8:07 ` Yongqiang Yang [this message]
2011-12-28 17:23   ` [PATCH 2/5] ext4: let ext4 journal deletion of data blocks Ted Ts'o
2011-12-30 14:59     ` Yongqiang Yang
2011-12-30 15:05       ` Ted Ts'o
2011-11-15  8:07 ` [PATCH 3/5] ext4: let ext4_free_blocks handle multiblock correctly Yongqiang Yang
2011-12-28 17:23   ` Ted Ts'o
2011-11-15  8:07 ` [PATCH 4/5] ext4: flush journal when switching from journal data mode Yongqiang Yang
2011-12-28 18:56   ` Ted Ts'o
2011-12-29 21:01     ` Darrick J. Wong
2011-12-30 14:43       ` Yongqiang Yang
2011-12-30 14:57       ` Ted Ts'o
2011-11-15  8:07 ` [PATCH 5/5] jbd2: clear revoked flag on buffers before a new transaction started Yongqiang Yang
2011-12-28 23:25   ` Ted Ts'o
2011-12-09  3:31 ` [PATCH 1/5] ext4: allocate delalloc blocks before changing journal mode Toshiyuki Okajima
2011-12-28 17:14 ` Ted Ts'o

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=1321344474-14707-2-git-send-email-xiaoqiangnk@gmail.com \
    --to=xiaoqiangnk@gmail.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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).