diff options
-rw-r--r-- | fs/jbd/checkpoint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index e29293501d42..fe8521933243 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
@@ -94,7 +94,7 @@ static int __try_to_free_cp_buf(struct journal_head *jh) | |||
94 | struct buffer_head *bh = jh2bh(jh); | 94 | struct buffer_head *bh = jh2bh(jh); |
95 | 95 | ||
96 | if (jh->b_jlist == BJ_None && !buffer_locked(bh) && | 96 | if (jh->b_jlist == BJ_None && !buffer_locked(bh) && |
97 | !buffer_dirty(bh) && buffer_uptodate(bh)) { | 97 | !buffer_dirty(bh) && !buffer_write_io_error(bh)) { |
98 | JBUFFER_TRACE(jh, "remove from checkpoint list"); | 98 | JBUFFER_TRACE(jh, "remove from checkpoint list"); |
99 | ret = __journal_remove_checkpoint(jh) + 1; | 99 | ret = __journal_remove_checkpoint(jh) + 1; |
100 | jbd_unlock_bh_state(bh); | 100 | jbd_unlock_bh_state(bh); |
@@ -199,7 +199,7 @@ restart: | |||
199 | spin_lock(&journal->j_list_lock); | 199 | spin_lock(&journal->j_list_lock); |
200 | goto restart; | 200 | goto restart; |
201 | } | 201 | } |
202 | if (unlikely(!buffer_uptodate(bh))) | 202 | if (unlikely(buffer_write_io_error(bh))) |
203 | ret = -EIO; | 203 | ret = -EIO; |
204 | 204 | ||
205 | /* | 205 | /* |
@@ -268,7 +268,7 @@ static int __process_buffer(journal_t *journal, struct journal_head *jh, | |||
268 | ret = 1; | 268 | ret = 1; |
269 | } else if (!buffer_dirty(bh)) { | 269 | } else if (!buffer_dirty(bh)) { |
270 | ret = 1; | 270 | ret = 1; |
271 | if (unlikely(!buffer_uptodate(bh))) | 271 | if (unlikely(buffer_write_io_error(bh))) |
272 | ret = -EIO; | 272 | ret = -EIO; |
273 | J_ASSERT_JH(jh, !buffer_jbddirty(bh)); | 273 | J_ASSERT_JH(jh, !buffer_jbddirty(bh)); |
274 | BUFFER_TRACE(bh, "remove from checkpoint"); | 274 | BUFFER_TRACE(bh, "remove from checkpoint"); |