Merge branch 'for-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[muen/linux.git] / fs / btrfs / extent_io.c

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 3738d245518cad6aea459541cde169d366567555..12ab19a4b93e16167d3c58f3a4991ed979fe46e5 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2032,7 +2032,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
                bio_put(bio);
                return -EIO;
        }
                bio_put(bio);
                return -EIO;
        }

-       bio->bi_bdev = dev->bdev;
+       bio_set_dev(bio, dev->bdev);

        bio->bi_opf = REQ_OP_WRITE | REQ_SYNC;
        bio_add_page(bio, page, length, pg_offset);
 
        bio->bi_opf = REQ_OP_WRITE | REQ_SYNC;
        bio_add_page(bio, page, length, pg_offset);
 


@@ -2060,7 +2060,7 @@ int repair_eb_io_failure(struct btrfs_fs_info *fs_info,
        unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
        int ret = 0;
 
        unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
        int ret = 0;
 

-       if (fs_info->sb->s_flags & MS_RDONLY)
+       if (sb_rdonly(fs_info->sb))

                return -EROFS;
 
        for (i = 0; i < num_pages; i++) {
                return -EROFS;
 
        for (i = 0; i < num_pages; i++) {


@@ -2110,7 +2110,7 @@ int clean_io_failure(struct btrfs_fs_info *fs_info,
                        failrec->start);
                goto out;
        }
                        failrec->start);
                goto out;
        }

-       if (fs_info->sb->s_flags & MS_RDONLY)
+       if (sb_rdonly(fs_info->sb))

                goto out;
 
        spin_lock(&io_tree->lock);
                goto out;
 
        spin_lock(&io_tree->lock);


@@ -2334,7 +2334,7 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
        bio = btrfs_io_bio_alloc(1);
        bio->bi_end_io = endio_func;
        bio->bi_iter.bi_sector = failrec->logical >> 9;
        bio = btrfs_io_bio_alloc(1);
        bio->bi_end_io = endio_func;
        bio->bi_iter.bi_sector = failrec->logical >> 9;

-       bio->bi_bdev = fs_info->fs_devices->latest_bdev;
+       bio_set_dev(bio, fs_info->fs_devices->latest_bdev);

        bio->bi_iter.bi_size = 0;
        bio->bi_private = data;
 
        bio->bi_iter.bi_size = 0;
        bio->bi_private = data;
 


@@ -2674,7 +2674,7 @@ struct bio *btrfs_bio_alloc(struct block_device *bdev, u64 first_byte)
        struct bio *bio;
 
        bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, btrfs_bioset);
        struct bio *bio;
 
        bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, btrfs_bioset);

-       bio->bi_bdev = bdev;
+       bio_set_dev(bio, bdev);

        bio->bi_iter.bi_sector = first_byte >> 9;
        btrfs_io_bio_init(btrfs_io_bio(bio));
        return bio;
        bio->bi_iter.bi_sector = first_byte >> 9;
        btrfs_io_bio_init(btrfs_io_bio(bio));
        return bio;