From 59ae3c3a89468e5680f2fe7d2ed32f688d0d2f27 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Fri, 8 Oct 2010 20:05:06 +0900 Subject: [PATCH] --- yaml --- r: 218831 b: refs/heads/master c: a910eefa511f9d1118effc13fba6773163502c4f h: refs/heads/master i: 218829: 5dbd0243183aef95544ed30cac6aa48e09eaf4f8 218827: 600ed71d22a7604814e6535225dd0b6ef9bd18df 218823: 0e17fa704cbefd88573d179d209ec8fe7b4692d8 218815: 4798c3d321bec3bb63d14306720fbcb818b851f3 v: v3 --- [refs] | 2 +- trunk/fs/jbd/commit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 345d81540e94..cbb5c3eca177 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dff6825e9fde93891e60751e01480337a991235e +refs/heads/master: a910eefa511f9d1118effc13fba6773163502c4f diff --git a/trunk/fs/jbd/commit.c b/trunk/fs/jbd/commit.c index 95d8c11c929e..c8428323167f 100644 --- a/trunk/fs/jbd/commit.c +++ b/trunk/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 @@ void journal_commit_transaction(journal_t *journal) 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