btrfs: fix races on root_log_ctx lists

[cascardo/linux.git] / fs / mpage.c

diff --git a/fs/mpage.c b/fs/mpage.c
index eedc644..d2413af 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -50,17 +50,18 @@ static void mpage_end_io(struct bio *bio)
 
        bio_for_each_segment_all(bv, bio, i) {
                struct page *page = bv->bv_page;
-               page_endio(page, bio_data_dir(bio), bio->bi_error);
+               page_endio(page, op_is_write(bio_op(bio)), bio->bi_error);
        }
 
        bio_put(bio);
 }
 
-static struct bio *mpage_bio_submit(int rw, struct bio *bio)
+static struct bio *mpage_bio_submit(int op, int op_flags, struct bio *bio)
 {
        bio->bi_end_io = mpage_end_io;
-       guard_bio_eod(rw, bio);
-       submit_bio(rw, bio);
+       bio_set_op_attrs(bio, op, op_flags);
+       guard_bio_eod(op, bio);
+       submit_bio(bio);
        return NULL;
 }
 
@@ -71,6 +72,8 @@ mpage_alloc(struct block_device *bdev,
 {
        struct bio *bio;
 
+       /* Restrict the given (page cache) mask for slab allocations */
+       gfp_flags &= GFP_KERNEL;
        bio = bio_alloc(gfp_flags, nr_vecs);
 
        if (bio == NULL && (current->flags & PF_MEMALLOC)) {
@@ -269,7 +272,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
         * This page will go to BIO.  Do we need to send this BIO off first?
         */
        if (bio && (*last_block_in_bio != blocks[0] - 1))
-               bio = mpage_bio_submit(READ, bio);
+               bio = mpage_bio_submit(REQ_OP_READ, 0, bio);
 
 alloc_new:
        if (bio == NULL) {
@@ -286,7 +289,7 @@ alloc_new:
 
        length = first_hole << blkbits;
        if (bio_add_page(bio, page, length, 0) < length) {
-               bio = mpage_bio_submit(READ, bio);
+               bio = mpage_bio_submit(REQ_OP_READ, 0, bio);
                goto alloc_new;
        }
 
@@ -294,7 +297,7 @@ alloc_new:
        nblocks = map_bh->b_size >> blkbits;
        if ((buffer_boundary(map_bh) && relative_block == nblocks) ||
            (first_hole != blocks_per_page))
-               bio = mpage_bio_submit(READ, bio);
+               bio = mpage_bio_submit(REQ_OP_READ, 0, bio);
        else
                *last_block_in_bio = blocks[blocks_per_page - 1];
 out:
@@ -302,7 +305,7 @@ out:
 
 confused:
        if (bio)
-               bio = mpage_bio_submit(READ, bio);
+               bio = mpage_bio_submit(REQ_OP_READ, 0, bio);
        if (!PageUptodate(page))
                block_read_full_page(page, get_block);
        else
@@ -362,7 +365,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
        sector_t last_block_in_bio = 0;
        struct buffer_head map_bh;
        unsigned long first_logical_block = 0;
-       gfp_t gfp = mapping_gfp_constraint(mapping, GFP_KERNEL);
+       gfp_t gfp = readahead_gfp_mask(mapping);
 
        map_bh.b_state = 0;
        map_bh.b_size = 0;
@@ -384,7 +387,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
        }
        BUG_ON(!list_empty(pages));
        if (bio)
-               mpage_bio_submit(READ, bio);
+               mpage_bio_submit(REQ_OP_READ, 0, bio);
        return 0;
 }
 EXPORT_SYMBOL(mpage_readpages);
@@ -405,7 +408,7 @@ int mpage_readpage(struct page *page, get_block_t get_block)
        bio = do_mpage_readpage(bio, page, 1, &last_block_in_bio,
                        &map_bh, &first_logical_block, get_block, gfp);
        if (bio)
-               mpage_bio_submit(READ, bio);
+               mpage_bio_submit(REQ_OP_READ, 0, bio);
        return 0;
 }
 EXPORT_SYMBOL(mpage_readpage);
@@ -486,7 +489,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
        struct buffer_head map_bh;
        loff_t i_size = i_size_read(inode);
        int ret = 0;
-       int wr = (wbc->sync_mode == WB_SYNC_ALL ?  WRITE_SYNC : WRITE);
+       int op_flags = (wbc->sync_mode == WB_SYNC_ALL ?  WRITE_SYNC : 0);
 
        if (page_has_buffers(page)) {
                struct buffer_head *head = page_buffers(page);
@@ -595,7 +598,7 @@ page_is_mapped:
         * This page will go to BIO.  Do we need to send this BIO off first?
         */
        if (bio && mpd->last_block_in_bio != blocks[0] - 1)
-               bio = mpage_bio_submit(wr, bio);
+               bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
 
 alloc_new:
        if (bio == NULL) {
@@ -622,7 +625,7 @@ alloc_new:
        wbc_account_io(wbc, page, PAGE_SIZE);
        length = first_unmapped << blkbits;
        if (bio_add_page(bio, page, length, 0) < length) {
-               bio = mpage_bio_submit(wr, bio);
+               bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
                goto alloc_new;
        }
 
@@ -632,7 +635,7 @@ alloc_new:
        set_page_writeback(page);
        unlock_page(page);
        if (boundary || (first_unmapped != blocks_per_page)) {
-               bio = mpage_bio_submit(wr, bio);
+               bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
                if (boundary_block) {
                        write_boundary_block(boundary_bdev,
                                        boundary_block, 1 << blkbits);
@@ -644,7 +647,7 @@ alloc_new:
 
 confused:
        if (bio)
-               bio = mpage_bio_submit(wr, bio);
+               bio = mpage_bio_submit(REQ_OP_WRITE, op_flags, bio);
 
        if (mpd->use_writepage) {
                ret = mapping->a_ops->writepage(page, wbc);
@@ -701,9 +704,9 @@ mpage_writepages(struct address_space *mapping,
 
                ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
                if (mpd.bio) {
-                       int wr = (wbc->sync_mode == WB_SYNC_ALL ?
-                                 WRITE_SYNC : WRITE);
-                       mpage_bio_submit(wr, mpd.bio);
+                       int op_flags = (wbc->sync_mode == WB_SYNC_ALL ?
+                                 WRITE_SYNC : 0);
+                       mpage_bio_submit(REQ_OP_WRITE, op_flags, mpd.bio);
                }
        }
        blk_finish_plug(&plug);
@@ -722,9 +725,9 @@ int mpage_writepage(struct page *page, get_block_t get_block,
        };
        int ret = __mpage_writepage(page, wbc, &mpd);
        if (mpd.bio) {
-               int wr = (wbc->sync_mode == WB_SYNC_ALL ?
-                         WRITE_SYNC : WRITE);
-               mpage_bio_submit(wr, mpd.bio);
+               int op_flags = (wbc->sync_mode == WB_SYNC_ALL ?
+                         WRITE_SYNC : 0);
+               mpage_bio_submit(REQ_OP_WRITE, op_flags, mpd.bio);
        }
        return ret;
 }