btrfs: root->fs_info cleanup, add fs_info convenience variables

In routines where someptr->fs_info is referenced multiple times, we
introduce a convenience variable.  This makes the code considerably
more readable.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 15 insertions, 10 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 3747af693e78..8df72ded9018 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2070,17 +2070,18 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical,
 int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb,
                          int mirror_num)
 {
+        struct btrfs_fs_info *fs_info = root->fs_info;
         u64 start = eb->start;
         unsigned long i, num_pages = num_extent_pages(eb->start, eb->len);
         int ret = 0;
 
-        if (root->fs_info->sb->s_flags & MS_RDONLY)
+        if (fs_info->sb->s_flags & MS_RDONLY)
                 return -EROFS;
 
         for (i = 0; i < num_pages; i++) {
                 struct page *p = eb->pages[i];
 
-                ret = repair_io_failure(root->fs_info->btree_inode, start,
+                ret = repair_io_failure(fs_info->btree_inode, start,
                                         PAGE_SIZE, start, p,
                                         start - page_offset(p), mirror_num);
                 if (ret)
@@ -2341,6 +2342,7 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
                                     struct page *page, int pg_offset, int icsum,
                                     bio_end_io_t *endio_func, void *data)
 {
+        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
         struct bio *bio;
         struct btrfs_io_bio *btrfs_failed_bio;
         struct btrfs_io_bio *btrfs_bio;
@@ -2351,13 +2353,12 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio,
 
         bio->bi_end_io = endio_func;
         bio->bi_iter.bi_sector = failrec->logical >> 9;
-        bio->bi_bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+        bio->bi_bdev = fs_info->fs_devices->latest_bdev;
         bio->bi_iter.bi_size = 0;
         bio->bi_private = data;
 
         btrfs_failed_bio = btrfs_io_bio(failed_bio);
         if (btrfs_failed_bio->csum) {
-                struct btrfs_fs_info *fs_info = BTRFS_I(inode)->root->fs_info;
                 u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
 
                 btrfs_bio = btrfs_io_bio(bio);
@@ -2476,6 +2477,8 @@ static void end_bio_extent_writepage(struct bio *bio)
 
         bio_for_each_segment_all(bvec, bio, i) {
                 struct page *page = bvec->bv_page;
+                struct inode *inode = page->mapping->host;
+                struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 
                 /* We always issue full-page reads, but if some block
                  * in a page fails to read, blk_update_request() will
@@ -2484,11 +2487,11 @@ static void end_bio_extent_writepage(struct bio *bio)
                  * if they don't add up to a full page.  */
                 if (bvec->bv_offset || bvec->bv_len != PAGE_SIZE) {
                         if (bvec->bv_offset + bvec->bv_len != PAGE_SIZE)
-                                btrfs_err(BTRFS_I(page->mapping->host)->root->fs_info,
+                                btrfs_err(fs_info,
                                    "partial page write in btrfs with offset %u and length %u",
                                         bvec->bv_offset, bvec->bv_len);
                         else
-                                btrfs_info(BTRFS_I(page->mapping->host)->root->fs_info,
+                                btrfs_info(fs_info,
                                    "incomplete page write in btrfs with offset %u and length %u",
                                         bvec->bv_offset, bvec->bv_len);
                 }
@@ -5789,6 +5792,7 @@ static void copy_pages(struct page *dst_page, struct page *src_page,
 void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                            unsigned long src_offset, unsigned long len)
 {
+        struct btrfs_fs_info *fs_info = dst->fs_info;
         size_t cur;
         size_t dst_off_in_page;
         size_t src_off_in_page;
@@ -5797,13 +5801,13 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
         unsigned long src_i;
 
         if (src_offset + len > dst->len) {
-                btrfs_err(dst->fs_info,
+                btrfs_err(fs_info,
                         "memmove bogus src_offset %lu move len %lu dst len %lu",
                          src_offset, len, dst->len);
                 BUG_ON(1);
         }
         if (dst_offset + len > dst->len) {
-                btrfs_err(dst->fs_info,
+                btrfs_err(fs_info,
                         "memmove bogus dst_offset %lu move len %lu dst len %lu",
                          dst_offset, len, dst->len);
                 BUG_ON(1);
@@ -5835,6 +5839,7 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
 void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
                            unsigned long src_offset, unsigned long len)
 {
+        struct btrfs_fs_info *fs_info = dst->fs_info;
         size_t cur;
         size_t dst_off_in_page;
         size_t src_off_in_page;
@@ -5845,13 +5850,13 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
         unsigned long src_i;
 
         if (src_offset + len > dst->len) {
-                btrfs_err(dst->fs_info,
+                btrfs_err(fs_info,
                           "memmove bogus src_offset %lu move len %lu len %lu",
                           src_offset, len, dst->len);
                 BUG_ON(1);
         }
         if (dst_offset + len > dst->len) {
-                btrfs_err(dst->fs_info,
+                btrfs_err(fs_info,
                           "memmove bogus dst_offset %lu move len %lu len %lu",
                           dst_offset, len, dst->len);
                 BUG_ON(1);