[PATCH] jbd: Cleanup __process_buffer()

[PATCH] jbd: Cleanup __process_buffer()

[Namhyung Kim]

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

Re: [PATCH] jbd: Cleanup __process_buffer()

[Jan Kara]

On Sat 16-10-10 17:30:14, Namhyung Kim wrote:
> Change initial value of 'ret' to 1 and set to 0 only if nothing
> happens actually.
  The result is 3 removed lines and I find the code readability the same
before and after the patch. So it's IMHO an unnecessary code churn. So I'm
sorry but I'm not taking the patch.

								Honza
> 
> 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
> 
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR