[PATCH] jbd: Convert bitops to buffer fns

[PATCH] jbd: Convert bitops to buffer fns

[Namhyung Kim]

Convert set/clear_bit(BH_JWrite, ...) to set/clear_buffer_jwrite()
for consistency.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 fs/jbd/commit.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 95d8c11..c842832 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -617,7 +617,7 @@ void journal_commit_transaction(journal_t *journal)
                    (this will requeue both the metadata buffer and the
                    temporary IO buffer). new_bh goes on BJ_IO*/
 
-		set_bit(BH_JWrite, &jh2bh(jh)->b_state);
+		set_buffer_jwrite(jh2bh(jh));
 		/*
 		 * akpm: journal_write_metadata_buffer() sets
 		 * new_bh->b_transaction to commit_transaction.
@@ -627,7 +627,7 @@ void journal_commit_transaction(journal_t *journal)
 		JBUFFER_TRACE(jh, "ph3: write metadata");
 		flags = journal_write_metadata_buffer(commit_transaction,
 						      jh, &new_jh, blocknr);
-		set_bit(BH_JWrite, &jh2bh(new_jh)->b_state);
+		set_buffer_jwrite(jh2bh(new_jh));
 		wbuf[bufs++] = jh2bh(new_jh);
 
 		/* Record the new block's tag in the current descriptor
@@ -737,7 +737,7 @@ wait_for_iobuf:
                    shadowed buffer */
 		jh = commit_transaction->t_shadow_list->b_tprev;
 		bh = jh2bh(jh);
-		clear_bit(BH_JWrite, &bh->b_state);
+		clear_buffer_jwrite(bh);
 		J_ASSERT_BH(bh, buffer_jbddirty(bh));
 
 		/* The metadata is now released for reuse, but we need
-- 
1.7.2.2

Re: [PATCH] jbd: Convert bitops to buffer fns

[Jan Kara]

On Fri 08-10-10 20:05:06, Namhyung Kim wrote:
> Convert set/clear_bit(BH_JWrite, ...) to set/clear_buffer_jwrite()
> for consistency.
  Thanks. Merged.

								Honza

> 
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
>  fs/jbd/commit.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
> index 95d8c11..c842832 100644
> --- a/fs/jbd/commit.c
> +++ b/fs/jbd/commit.c
> @@ -617,7 +617,7 @@ void journal_commit_transaction(journal_t *journal)
>                     (this will requeue both the metadata buffer and the
>                     temporary IO buffer). new_bh goes on BJ_IO*/
>  
> -		set_bit(BH_JWrite, &jh2bh(jh)->b_state);
> +		set_buffer_jwrite(jh2bh(jh));
>  		/*
>  		 * akpm: journal_write_metadata_buffer() sets
>  		 * new_bh->b_transaction to commit_transaction.
> @@ -627,7 +627,7 @@ void journal_commit_transaction(journal_t *journal)
>  		JBUFFER_TRACE(jh, "ph3: write metadata");
>  		flags = journal_write_metadata_buffer(commit_transaction,
>  						      jh, &new_jh, blocknr);
> -		set_bit(BH_JWrite, &jh2bh(new_jh)->b_state);
> +		set_buffer_jwrite(jh2bh(new_jh));
>  		wbuf[bufs++] = jh2bh(new_jh);
>  
>  		/* Record the new block's tag in the current descriptor
> @@ -737,7 +737,7 @@ wait_for_iobuf:
>                     shadowed buffer */
>  		jh = commit_transaction->t_shadow_list->b_tprev;
>  		bh = jh2bh(jh);
> -		clear_bit(BH_JWrite, &bh->b_state);
> +		clear_buffer_jwrite(bh);
>  		J_ASSERT_BH(bh, buffer_jbddirty(bh));
>  
>  		/* The metadata is now released for reuse, but we need
> -- 
> 1.7.2.2
> 
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR