Commit 6fee248d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 90c0304c

fs/btrfs/btrfs_inode.h

+5 −0
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/ctree.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

{

fs/btrfs/extent_io.c

+3 −3
Original line number Diff line number Diff line
@@ -4555,7 +4555,7 @@ int try_release_extent_mapping(struct page *page, gfp_t mask) 
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

fs/btrfs/file.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/ordered-data.c

+1 −1
Original line number Diff line number Diff line
@@ -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;