Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c32b0d4b authored by Hai Shan's avatar Hai Shan Committed by Linus Torvalds
Browse files

fs/mpage.c: consolidate code 



Merge mpage_end_io_read() and mpage_end_io_write() into mpage_end_io() to
eliminate code duplication.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarHai Shan <shan.hai@windriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9cbb4cb2

fs/mpage.c

+17 −32
Original line number Diff line number Diff line
@@ -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,7 +50,7 @@ static void mpage_end_io_read(struct bio *bio, int err) 


		if (--bvec >= bio->bi_io_vec)

			prefetchw(&bvec->bv_page->flags);



		if (bio_data_dir(bio) == READ) {

			if (uptodate) {

				SetPageUptodate(page);

			} else {
@@ -58,36 +58,21 @@ static void mpage_end_io_read(struct bio *bio, int err) 
				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);



		} else { /* bio_data_dir(bio) == WRITE */

			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);

}



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;

}