Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ffbd68c authored by David Sterba's avatar David Sterba
Browse files

btrfs: simplify pointer chasing of local fs_info variables 



Functions that get btrfs inode can simply reach the fs_info by
dereferencing the root and this looks a bit more straightforward
compared to the btrfs_sb(...) indirection.

If the transaction handle is available and not NULL it's used instead.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 37508515

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 


int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct btrfs_trans_handle *trans;

	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);

	struct btrfs_path *path;
@@ -1837,7 +1837,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, 


int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct btrfs_delayed_node *delayed_node;



	/*

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ struct extent_map *btree_get_extent(struct btrfs_inode *inode, 
		struct page *page, size_t pg_offset, u64 start, u64 len,

		int create)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_map *em;

	int ret;

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -5889,7 +5889,7 @@ static void btrfs_calculate_inode_block_rsv_size(struct btrfs_fs_info *fs_info, 


int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	unsigned nr_extents;

	enum btrfs_reserve_flush_enum flush = BTRFS_RESERVE_FLUSH_ALL;

	int ret = 0;
@@ -5962,7 +5962,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes) 
void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,

				     bool qgroup_free)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;



	num_bytes = ALIGN(num_bytes, fs_info->sectorsize);

	spin_lock(&inode->lock);
@@ -5991,7 +5991,7 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes, 
void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,

				    bool qgroup_free)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	unsigned num_extents;



	spin_lock(&inode->lock);

fs/btrfs/file-item.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, 
				     const bool new_inline,

				     struct extent_map *em)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct btrfs_root *root = inode->root;

	struct extent_buffer *leaf = path->nodes[0];

	const int slot = path->slots[0];

fs/btrfs/file.c

+7 −7
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int __compare_inode_defrag(struct inode_defrag *defrag1, 
static int __btrfs_add_inode_defrag(struct btrfs_inode *inode,

				    struct inode_defrag *defrag)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct inode_defrag *entry;

	struct rb_node **p;

	struct rb_node *parent = NULL;
@@ -135,8 +135,8 @@ static inline int __need_auto_defrag(struct btrfs_fs_info *fs_info) 
int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

			   struct btrfs_inode *inode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_root *root = inode->root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct inode_defrag *defrag;

	u64 transid;

	int ret;
@@ -185,7 +185,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 
static void btrfs_requeue_inode_defrag(struct btrfs_inode *inode,

				       struct inode_defrag *defrag)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	int ret;



	if (!__need_auto_defrag(fs_info))
@@ -1132,7 +1132,7 @@ static int extent_mergeable(struct extent_buffer *leaf, int slot, 
int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,

			      struct btrfs_inode *inode, u64 start, u64 end)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *root = inode->root;

	struct extent_buffer *leaf;

	struct btrfs_path *path;
@@ -1469,7 +1469,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages, 
				u64 *lockstart, u64 *lockend,

				struct extent_state **cached_state)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	u64 start_pos;

	u64 last_pos;

	int i;
@@ -1525,7 +1525,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages, 
static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos,

				    size_t *write_bytes)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct btrfs_root *root = inode->root;

	struct btrfs_ordered_extent *ordered;

	u64 lockstart, lockend;
@@ -2227,7 +2227,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, 
		struct btrfs_inode *inode,

		struct btrfs_path *path, u64 offset, u64 end)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *root = inode->root;

	struct extent_buffer *leaf;

	struct btrfs_file_extent_item *fi;