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

Commit 4a0cc7ca authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make btrfs_ino take a struct btrfs_inode 



Currently btrfs_ino takes a struct inode and this causes a lot of
internal btrfs functions which consume this ino to take a VFS inode,
rather than btrfs' own struct btrfs_inode. In order to fix this "leak"
of VFS structs into the internals of btrfs first it's necessary to
eliminate all uses of struct inode for the purpose of inode. This patch
does that by using BTRFS_I to convert an inode to btrfs_inode. With
this problem eliminated subsequent patches will start eliminating the
passing of struct inode altogether, eventually resulting in a lot cleaner
code.

Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
[ fix btrfs_get_extent tracepoint prototype ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 823bb20a

fs/btrfs/btrfs_inode.h

+5 −5
Original line number Diff line number Diff line
@@ -224,16 +224,16 @@ static inline void btrfs_insert_inode_hash(struct inode *inode) 
	__insert_inode_hash(inode, h);

}



static inline u64 btrfs_ino(struct inode *inode)

static inline u64 btrfs_ino(struct btrfs_inode *inode)

{

	u64 ino = BTRFS_I(inode)->location.objectid;

	u64 ino = inode->location.objectid;



	/*

	 * !ino: btree_inode

	 * type == BTRFS_ROOT_ITEM_KEY: subvol dir

	 */

	if (!ino || BTRFS_I(inode)->location.type == BTRFS_ROOT_ITEM_KEY)

		ino = inode->i_ino;

	if (!ino || inode->location.type == BTRFS_ROOT_ITEM_KEY)

		ino = inode->vfs_inode.i_ino;

	return ino;

}
@@ -248,7 +248,7 @@ static inline bool btrfs_is_free_space_inode(struct inode *inode) 
	struct btrfs_root *root = BTRFS_I(inode)->root;



	if (root == root->fs_info->tree_root &&

	    btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID)

	    btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID)

		return true;

	if (BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID)

		return true;

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int check_compressed_csum(struct inode *inode, 
		if (csum != *cb_sum) {

			btrfs_info(BTRFS_I(inode)->root->fs_info,

			   "csum failed ino %llu extent %llu csum %u wanted %u mirror %d",

			   btrfs_ino(inode), disk_start, csum, *cb_sum,

			   btrfs_ino(BTRFS_I(inode)), disk_start, csum, *cb_sum,

			   cb->mirror_num);

			ret = -EIO;

			goto fail;

fs/btrfs/delayed-inode.c

+7 −7
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static struct btrfs_delayed_node *btrfs_get_delayed_node(struct inode *inode) 
{

	struct btrfs_inode *btrfs_inode = BTRFS_I(inode);

	struct btrfs_root *root = btrfs_inode->root;

	u64 ino = btrfs_ino(inode);

	u64 ino = btrfs_ino(btrfs_inode);

	struct btrfs_delayed_node *node;



	node = READ_ONCE(btrfs_inode->delayed_node);
@@ -112,7 +112,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( 
	struct btrfs_delayed_node *node;

	struct btrfs_inode *btrfs_inode = BTRFS_I(inode);

	struct btrfs_root *root = btrfs_inode->root;

	u64 ino = btrfs_ino(inode);

	u64 ino = btrfs_ino(btrfs_inode);

	int ret;



again:
@@ -637,7 +637,7 @@ static int btrfs_delayed_inode_reserve_metadata( 
			node->bytes_reserved = num_bytes;

			trace_btrfs_space_reservation(fs_info,

						      "delayed_inode",

						      btrfs_ino(inode),

						      btrfs_ino(BTRFS_I(inode)),

						      num_bytes, 1);

		}

		return ret;
@@ -660,13 +660,13 @@ static int btrfs_delayed_inode_reserve_metadata( 
	 */

	if (!ret) {

		trace_btrfs_space_reservation(fs_info, "delayed_inode",

					      btrfs_ino(inode), num_bytes, 1);

					      btrfs_ino(BTRFS_I(inode)), num_bytes, 1);

		node->bytes_reserved = num_bytes;

	}



	if (release) {

		trace_btrfs_space_reservation(fs_info, "delalloc",

					      btrfs_ino(inode), num_bytes, 0);

					      btrfs_ino(BTRFS_I(inode)), num_bytes, 0);

		btrfs_block_rsv_release(fs_info, src_rsv, num_bytes);

	}
@@ -1453,7 +1453,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
		goto release_node;

	}



	delayed_item->key.objectid = btrfs_ino(dir);

	delayed_item->key.objectid = btrfs_ino(BTRFS_I(dir));

	delayed_item->key.type = BTRFS_DIR_INDEX_KEY;

	delayed_item->key.offset = index;
@@ -1521,7 +1521,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	if (IS_ERR(node))

		return PTR_ERR(node);



	item_key.objectid = btrfs_ino(dir);

	item_key.objectid = btrfs_ino(BTRFS_I(dir));

	item_key.type = BTRFS_DIR_INDEX_KEY;

	item_key.offset = index;

fs/btrfs/dir-item.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	struct btrfs_disk_key disk_key;

	u32 data_size;



	key.objectid = btrfs_ino(dir);

	key.objectid = btrfs_ino(BTRFS_I(dir));

	key.type = BTRFS_DIR_ITEM_KEY;

	key.offset = btrfs_name_hash(name, name_len);

fs/btrfs/export.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len, 
	len  = BTRFS_FID_SIZE_NON_CONNECTABLE;

	type = FILEID_BTRFS_WITHOUT_PARENT;



	fid->objectid = btrfs_ino(inode);

	fid->objectid = btrfs_ino(BTRFS_I(inode));

	fid->root_objectid = BTRFS_I(inode)->root->objectid;

	fid->gen = inode->i_generation;
@@ -166,13 +166,13 @@ static struct dentry *btrfs_get_parent(struct dentry *child) 
	if (!path)

		return ERR_PTR(-ENOMEM);



	if (btrfs_ino(dir) == BTRFS_FIRST_FREE_OBJECTID) {

	if (btrfs_ino(BTRFS_I(dir)) == BTRFS_FIRST_FREE_OBJECTID) {

		key.objectid = root->root_key.objectid;

		key.type = BTRFS_ROOT_BACKREF_KEY;

		key.offset = (u64)-1;

		root = fs_info->tree_root;

	} else {

		key.objectid = btrfs_ino(dir);

		key.objectid = btrfs_ino(BTRFS_I(dir));

		key.type = BTRFS_INODE_REF_KEY;

		key.offset = (u64)-1;

	}
@@ -238,7 +238,7 @@ static int btrfs_get_name(struct dentry *parent, char *name, 
	if (!S_ISDIR(dir->i_mode))

		return -EINVAL;



	ino = btrfs_ino(inode);

	ino = btrfs_ino(BTRFS_I(inode));



	path = btrfs_alloc_path();

	if (!path)
@@ -252,7 +252,7 @@ static int btrfs_get_name(struct dentry *parent, char *name, 
		root = fs_info->tree_root;

	} else {

		key.objectid = ino;

		key.offset = btrfs_ino(dir);

		key.offset = btrfs_ino(BTRFS_I(dir));

		key.type = BTRFS_INODE_REF_KEY;

	}