From 27efad129037a8573b06d146117f981ce0d3683a Mon Sep 17 00:00:00 2001 From: Hidehiro Kawai Date: Wed, 22 Oct 2008 14:15:02 -0700 Subject: [PATCH] --- yaml --- r: 116974 b: refs/heads/master c: 9f818b4ac04f53458d0354950b4f229f54be4dbf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/checkpoint.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bec1bb4bcec5..357b7dfe09aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d7c820e56ce83b23daee9eb5343730fb309418e +refs/heads/master: 9f818b4ac04f53458d0354950b4f229f54be4dbf diff --git a/trunk/fs/jbd/checkpoint.c b/trunk/fs/jbd/checkpoint.c index e29293501d42..fe8521933243 100644 --- a/trunk/fs/jbd/checkpoint.c +++ b/trunk/fs/jbd/checkpoint.c @@ -94,7 +94,7 @@ static int __try_to_free_cp_buf(struct journal_head *jh) struct buffer_head *bh = jh2bh(jh); if (jh->b_jlist == BJ_None && !buffer_locked(bh) && - !buffer_dirty(bh) && buffer_uptodate(bh)) { + !buffer_dirty(bh) && !buffer_write_io_error(bh)) { JBUFFER_TRACE(jh, "remove from checkpoint list"); ret = __journal_remove_checkpoint(jh) + 1; jbd_unlock_bh_state(bh); @@ -199,7 +199,7 @@ static int __wait_cp_io(journal_t *journal, transaction_t *transaction) spin_lock(&journal->j_list_lock); goto restart; } - if (unlikely(!buffer_uptodate(bh))) + if (unlikely(buffer_write_io_error(bh))) ret = -EIO; /* @@ -268,7 +268,7 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh, ret = 1; } else if (!buffer_dirty(bh)) { ret = 1; - if (unlikely(!buffer_uptodate(bh))) + if (unlikely(buffer_write_io_error(bh))) ret = -EIO; J_ASSERT_JH(jh, !buffer_jbddirty(bh)); BUFFER_TRACE(bh, "remove from checkpoint");