diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-06 09:57:33 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-06 09:57:33 -0700 |
| commit | 0b68177ccd12866d9f19cafad212b861c9d02a8c (patch) | |
| tree | 6fc26aa59fb183fe9c86d44ae14ce423ad7211da /fs | |
| parent | d0d2f2df65ddea9a30ddd117f769bfff65d3fc56 (diff) | |
| parent | 7cef5677ef3a8084f2588ce0a129dc95d65161f6 (diff) | |
| download | blackbird-op-linux-0b68177ccd12866d9f19cafad212b861c9d02a8c.tar.gz blackbird-op-linux-0b68177ccd12866d9f19cafad212b861c9d02a8c.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd/checkpoint.c | 5 | ||||
| -rw-r--r-- | fs/mpage.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index 98d830401c56..5a97e346bd95 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c @@ -188,7 +188,6 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) } else { jbd_unlock_bh_state(bh); } - jh = next_jh; } while (jh != last_jh); return ret; @@ -339,8 +338,10 @@ int log_do_checkpoint(journal_t *journal) } } while (jh != last_jh && !retry); - if (batch_count) + if (batch_count) { __flush_batch(journal, bhs, &batch_count); + retry = 1; + } /* * If someone cleaned up this transaction while we slept, we're diff --git a/fs/mpage.c b/fs/mpage.c index b92c0e64aefa..bb9aebe93862 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -79,8 +79,11 @@ static int mpage_end_io_write(struct bio *bio, unsigned int bytes_done, int err) if (--bvec >= bio->bi_io_vec) prefetchw(&bvec->bv_page->flags); - if (!uptodate) + if (!uptodate){ SetPageError(page); + if (page->mapping) + set_bit(AS_EIO, &page->mapping->flags); + } end_page_writeback(page); } while (bvec >= bio->bi_io_vec); bio_put(bio); |
