btrfs: convert btrfs_inode_sectorsize to take btrfs_inode

It's counterintuitive to have a function named btrfs_inode_xxx which
takes a generic inode. Also move the function to btrfs_inode.h so that
it has access to the definition of struct btrfs_inode.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 00f7831d09026e184859b37b844f267f1b9b6ace..6fdb46d58299d4e3dc67d5c280461daedeff629d 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -217,6 +217,11 @@ struct btrfs_inode {
        struct inode vfs_inode;
 };
 
+static inline u32 btrfs_inode_sectorsize(const struct btrfs_inode *inode)
+{
+       return inode->root->fs_info->sectorsize;
+}
+
 static inline struct btrfs_inode *BTRFS_I(const struct inode *inode)
 {
        return container_of(inode, struct btrfs_inode, vfs_inode);

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index b4d3a4d8205302da144abd7a5da8b76646c8e29e..af2bd059daae9065498950d4129a193ca2a0c1ac 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1197,10 +1197,6 @@ struct btrfs_file_private {
        void *filldir_buf;
 };
 
-static inline u32 btrfs_inode_sectorsize(const struct inode *inode)
-{
-       return btrfs_sb(inode->i_sb)->sectorsize;
-}
 
 static inline u32 BTRFS_LEAF_DATA_SIZE(const struct btrfs_fs_info *info)
 {

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index f971e9d689dfca65beefe3a3304a1729bf99ff70..94ec2455de99a9817883475e2a340d5bcd3579b0 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4555,7 +4555,7 @@ next:
 static struct extent_map *get_extent_skip_holes(struct inode *inode,
                                                u64 offset, u64 last)
 {
-       u64 sectorsize = btrfs_inode_sectorsize(inode);
+       u64 sectorsize = btrfs_inode_sectorsize(BTRFS_I(inode));
        struct extent_map *em;
        u64 len;
 
@@ -4736,8 +4736,8 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                goto out_free_ulist;
        }
 
-       start = round_down(start, btrfs_inode_sectorsize(inode));
-       len = round_up(max, btrfs_inode_sectorsize(inode)) - start;
+       start = round_down(start, btrfs_inode_sectorsize(BTRFS_I(inode)));
+       len = round_up(max, btrfs_inode_sectorsize(BTRFS_I(inode))) - start;
 
        /*
         * lookup the last file extent.  We're not using i_size here

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 7c37a43cc2e315919ba34837943001252207030f..30c511d1e70b1f6ddfa9fb0974f7a6a0748f4826 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2901,9 +2901,9 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
                goto out_only_mutex;
        }
 
-       lockstart = round_up(offset, btrfs_inode_sectorsize(inode));
+       lockstart = round_up(offset, btrfs_inode_sectorsize(BTRFS_I(inode)));
        lockend = round_down(offset + len,
-                            btrfs_inode_sectorsize(inode)) - 1;
+                            btrfs_inode_sectorsize(BTRFS_I(inode))) - 1;
        same_block = (BTRFS_BYTES_TO_BLKS(fs_info, offset))
                == (BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1));
        /*
@@ -3108,7 +3108,7 @@ enum {
 static int btrfs_zero_range_check_range_boundary(struct inode *inode,
                                                 u64 offset)
 {
-       const u64 sectorsize = btrfs_inode_sectorsize(inode);
+       const u64 sectorsize = btrfs_inode_sectorsize(BTRFS_I(inode));
        struct extent_map *em;
        int ret;
 
@@ -3138,7 +3138,7 @@ static int btrfs_zero_range(struct inode *inode,
        struct extent_changeset *data_reserved = NULL;
        int ret;
        u64 alloc_hint = 0;
-       const u64 sectorsize = btrfs_inode_sectorsize(inode);
+       const u64 sectorsize = btrfs_inode_sectorsize(BTRFS_I(inode));
        u64 alloc_start = round_down(offset, sectorsize);
        u64 alloc_end = round_up(offset + len, sectorsize);
        u64 bytes_to_reserve = 0;
@@ -3319,7 +3319,7 @@ static long btrfs_fallocate(struct file *file, int mode,
        u64 locked_end;
        u64 actual_end = 0;
        struct extent_map *em;
-       int blocksize = btrfs_inode_sectorsize(inode);
+       int blocksize = btrfs_inode_sectorsize(BTRFS_I(inode));
        int ret;
 
        alloc_start = round_down(offset, blocksize);

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 168a5edd939df83ceef9f6306d1ac43d0a9383ce..d39a0fe4c463c17d01493637237190978fb2c1d5 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -870,7 +870,7 @@ int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u64 disk_bytenr,
        struct btrfs_ordered_inode_tree *tree = &BTRFS_I(inode)->ordered_tree;
        unsigned long num_sectors;
        unsigned long i;
-       u32 sectorsize = btrfs_inode_sectorsize(inode);
+       u32 sectorsize = btrfs_inode_sectorsize(BTRFS_I(inode));
        const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
        int index = 0;
 

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index 5cd02514cf4d48505c2c2d3a43e5022331dbd8a8..7126f94cf216df73d6b2990c3ade6d257722fb53 100644 (file)
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -52,7 +52,7 @@ static int copy_inline_to_page(struct inode *inode,
                               const u64 datal,
                               const u8 comp_type)
 {
-       const u64 block_size = btrfs_inode_sectorsize(inode);
+       const u64 block_size = btrfs_inode_sectorsize(BTRFS_I(inode));
        const u64 range_end = file_offset + block_size - 1;
        const size_t inline_size = size - btrfs_file_extent_calc_inline_size(0);
        char *data_start = inline_data + btrfs_file_extent_calc_inline_size(0);