Commit ee8ba05c authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: open code and remove btrfs_inode_sectorsize helper 



This is defined in btrfs_inode.h, and dereferences btrfs_root and
btrfs_fs_info, both of which aren't defined in btrfs_inode.h.
Additionally, in many places we already have root or fs_info, so this
helper often makes the code harder to read.  So delete the helper and
simply open code it in the few places that we use it.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2b6433c7

fs/btrfs/btrfs_inode.h

+0 −5
Original line number Diff line number Diff line
@@ -251,11 +251,6 @@ 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/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -3921,8 +3921,8 @@ int extent_fiemap(struct btrfs_inode *inode, struct fiemap_extent_info *fieinfo, 
		goto out;

	}



	lockstart = round_down(start, btrfs_inode_sectorsize(inode));

	lockend = round_up(start + len, btrfs_inode_sectorsize(inode));

	lockstart = round_down(start, root->fs_info->sectorsize);

	lockend = round_up(start + len, root->fs_info->sectorsize);

	prev_extent_end = lockstart;



	lock_extent(&inode->io_tree, lockstart, lockend, &cached_state);

fs/btrfs/file.c

+5 −6
Original line number Diff line number Diff line
@@ -3008,9 +3008,8 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len) 
	if (ret)

		goto out_only_mutex;



	lockstart = round_up(offset, btrfs_inode_sectorsize(BTRFS_I(inode)));

	lockend = round_down(offset + len,

			     btrfs_inode_sectorsize(BTRFS_I(inode))) - 1;

	lockstart = round_up(offset, fs_info->sectorsize);

	lockend = round_down(offset + len, fs_info->sectorsize) - 1;

	same_block = (BTRFS_BYTES_TO_BLKS(fs_info, offset))

		== (BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1));

	/*
@@ -3212,7 +3211,7 @@ enum { 
static int btrfs_zero_range_check_range_boundary(struct btrfs_inode *inode,

						 u64 offset)

{

	const u64 sectorsize = btrfs_inode_sectorsize(inode);

	const u64 sectorsize = inode->root->fs_info->sectorsize;

	struct extent_map *em;

	int ret;
@@ -3242,7 +3241,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(BTRFS_I(inode));

	const u64 sectorsize = fs_info->sectorsize;

	u64 alloc_start = round_down(offset, sectorsize);

	u64 alloc_end = round_up(offset + len, sectorsize);

	u64 bytes_to_reserve = 0;
@@ -3428,7 +3427,7 @@ static long btrfs_fallocate(struct file *file, int mode, 
	u64 data_space_reserved = 0;

	u64 qgroup_reserved = 0;

	struct extent_map *em;

	int blocksize = btrfs_inode_sectorsize(BTRFS_I(inode));

	int blocksize = BTRFS_I(inode)->root->fs_info->sectorsize;

	int ret;



	/* Do not allow fallocate in ZONED mode */