From: Namhyung Kim <namhyung@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>, Jan Kara <jack@suse.cz>
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] jbd: Cleanup __process_buffer()
Date: Sat, 16 Oct 2010 17:30:14 +0900 [thread overview]
Message-ID: <1287217814-5782-1-git-send-email-namhyung@gmail.com> (raw)
Change initial value of 'ret' to 1 and set to 0 only if nothing
happens actually.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
fs/jbd/checkpoint.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index e4b87bc..0a687a6 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -280,7 +280,7 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh,
struct buffer_head **bhs, int *batch_count)
{
struct buffer_head *bh = jh2bh(jh);
- int ret = 0;
+ int ret = 1;
if (buffer_locked(bh)) {
get_bh(bh);
@@ -290,7 +290,6 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh,
/* the journal_head may have gone by now */
BUFFER_TRACE(bh, "brelse");
__brelse(bh);
- ret = 1;
} else if (jh->b_transaction != NULL) {
transaction_t *t = jh->b_transaction;
tid_t tid = t->t_tid;
@@ -299,9 +298,7 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh,
jbd_unlock_bh_state(bh);
log_start_commit(journal, tid);
log_wait_commit(journal, tid);
- ret = 1;
} else if (!buffer_dirty(bh)) {
- ret = 1;
if (unlikely(buffer_write_io_error(bh)))
ret = -EIO;
J_ASSERT_JH(jh, !buffer_jbddirty(bh));
@@ -330,8 +327,8 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh,
if (*batch_count == NR_BATCH) {
spin_unlock(&journal->j_list_lock);
__flush_batch(journal, bhs, batch_count);
- ret = 1;
- }
+ } else
+ ret = 0;
}
return ret;
}
--
1.7.0.4
next reply other threads:[~2010-10-16 8:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-16 8:30 Namhyung Kim [this message]
2010-10-18 10:57 ` [PATCH] jbd: Cleanup __process_buffer() Jan Kara
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=1287217814-5782-1-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).