mpage: some code cleanups
Merged mpage_end_io_read() and mpage_end_io_write() to mpage_end_io(), because they share three of four codes.
--- fs/mpage.c | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-)
PATCH 1/1 mpage: some code cleanups
merged mpage_end_io_read() and mpage_end_io_write() to mpage_end_io()
Signed-off-by Hai Shan <[email protected]>
--- fs/mpage.c | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-)
fs/mpage.c +17 -32
@@ -40,7 +40,7 @@* status of that page is hard. See end_buffer_async_read() for the details. * There is no point in duplicating all that complexity. */ -static void mpage_end_io_read (struct bio *bio,int err) +static void mpage_end_io (struct bio *bio,int err) {const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags);struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ;
@@ -50,44 +50,29 @@ static void mpage_end_io_read(struct bio *bio, int err)if (--bvec >= bio->bi_io_vec)prefetchw (&bvec->bv_page->flags); - -if (uptodate) { -SetPageUptodate (page); - }else { -ClearPageUptodate (page); -SetPageError (page); - } -unlock_page (page); - }while (bvec >= bio->bi_io_vec); -bio_put (bio); -} - -static void mpage_end_io_write (struct bio *bio,int err) -{ -const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt -1 ; - -do { -struct page *page = bvec->bv_page; - -if (--bvec >= bio->bi_io_vec) -prefetchw (&bvec->bv_page->flags); - -if (!uptodate){ -SetPageError (page); -if (page->mapping) -set_bit (AS_EIO , &page->mapping->flags); +if (bio_data_dir (bio) ==READ ) { +if (uptodate) { +SetPageUptodate (page); + }else { +ClearPageUptodate (page); +SetPageError (page); + } +unlock_page (page); + }else {/* bio_data_dir(bio) == WRITE */ +if (!uptodate){ +SetPageError (page); +if (page->mapping) +set_bit (AS_EIO , &page->mapping->flags); + } +end_page_writeback (page); } -end_page_writeback (page); }while (bvec >= bio->bi_io_vec);bio_put (bio); }static struct bio *mpage_bio_submit (int rw,struct bio *bio) { - bio->bi_end_io = mpage_end_io_read; -if (rw ==WRITE ) - bio->bi_end_io = mpage_end_io_write; + bio->bi_end_io = mpage_end_io;submit_bio (rw, bio);return NULL ; }
Signature · 1 line
1.7.0.4