ARM: OMAP4+: dpll: remove cpu_is_omap44xx checks

[firefly-linux-kernel-4.4.55.git] / fs / mpage.c

diff --git a/fs/mpage.c b/fs/mpage.c
index 4cc9c5d079f71d09c4f60b42ecbea18896868d6c..5f9ed622274f411128752d7efd472f954f669a6e 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -48,23 +48,7 @@ static void mpage_end_io(struct bio *bio, int err)
 
        bio_for_each_segment_all(bv, bio, i) {
                struct page *page = bv->bv_page;
-
-               if (bio_data_dir(bio) == READ) {
-                       if (!err) {
-                               SetPageUptodate(page);
-                       } else {
-                               ClearPageUptodate(page);
-                               SetPageError(page);
-                       }
-                       unlock_page(page);
-               } else { /* bio_data_dir(bio) == WRITE */
-                       if (err) {
-                               SetPageError(page);
-                               if (page->mapping)
-                                       set_bit(AS_EIO, &page->mapping->flags);
-                       }
-                       end_page_writeback(page);
-               }
+               page_endio(page, bio_data_dir(bio), err);
        }
 
        bio_put(bio);
@@ -285,6 +269,11 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
 
 alloc_new:
        if (bio == NULL) {
+               if (first_hole == blocks_per_page) {
+                       if (!bdev_read_page(bdev, blocks[0] << (blkbits - 9),
+                                                               page))
+                               goto out;
+               }
                bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
                                min_t(int, nr_pages, bio_get_nr_vecs(bdev)),
                                GFP_KERNEL);
@@ -603,6 +592,13 @@ page_is_mapped:
 
 alloc_new:
        if (bio == NULL) {
+               if (first_unmapped == blocks_per_page) {
+                       if (!bdev_write_page(bdev, blocks[0] << (blkbits - 9),
+                                                               page, wbc)) {
+                               clean_buffers(page, first_unmapped);
+                               goto out;
+                       }
+               }
                bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9),
                                bio_get_nr_vecs(bdev), GFP_NOFS|__GFP_HIGH);
                if (bio == NULL)