Commit 0202e83f authored by David Sterba's avatar David Sterba
Browse files

btrfs: simplify iget helpers 



The inode lookup starting at btrfs_iget takes the full location key,
while only the objectid is used to match the inode, because the lookup
happens inside the given root thus the inode number is unique.
The entire location key is properly set up in btrfs_init_locked_inode.

Simplify the helpers and pass only inode number, renaming it to 'ino'
instead of 'objectid'. This allows to remove temporary variables key,
saving some stack space.

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

fs/btrfs/ctree.h

+2 −3
Original line number Diff line number Diff line
@@ -2898,10 +2898,9 @@ void btrfs_free_inode(struct inode *inode); 
int btrfs_drop_inode(struct inode *inode);

int __init btrfs_init_cachep(void);

void __cold btrfs_destroy_cachep(void);

struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,

struct inode *btrfs_iget_path(struct super_block *s, u64 ino,

			      struct btrfs_root *root, struct btrfs_path *path);

struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,

			 struct btrfs_root *root);

struct inode *btrfs_iget(struct super_block *s, u64 ino, struct btrfs_root *root);

struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,

				    struct page *page, size_t pg_offset,

				    u64 start, u64 end);

fs/btrfs/export.c

+2 −9
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
	struct btrfs_fs_info *fs_info = btrfs_sb(sb);

	struct btrfs_root *root;

	struct inode *inode;

	struct btrfs_key key;



	if (objectid < BTRFS_FIRST_FREE_OBJECTID)

		return ERR_PTR(-ESTALE);
@@ -73,11 +72,7 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
	if (IS_ERR(root))

		return ERR_CAST(root);



	key.objectid = objectid;

	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;



	inode = btrfs_iget(sb, &key, root);

	inode = btrfs_iget(sb, objectid, root);

	btrfs_put_root(root);

	if (IS_ERR(inode))

		return ERR_CAST(inode);
@@ -196,9 +191,7 @@ struct dentry *btrfs_get_parent(struct dentry *child) 
					found_key.offset, 0, 0);

	}



	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	return d_obtain_alias(btrfs_iget(fs_info->sb, &key, root));

	return d_obtain_alias(btrfs_iget(fs_info->sb, key.objectid, root));

fail:

	btrfs_free_path(path);

	return ERR_PTR(ret);

fs/btrfs/file.c

+1 −5
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info, 
{

	struct btrfs_root *inode_root;

	struct inode *inode;

	struct btrfs_key key;

	struct btrfs_ioctl_defrag_range_args range;

	int num_defrag;

	int ret;
@@ -287,10 +286,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info, 
		goto cleanup;

	}



	key.objectid = defrag->ino;

	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	inode = btrfs_iget(fs_info->sb, &key, inode_root);

	inode = btrfs_iget(fs_info->sb, defrag->ino, inode_root);

	btrfs_put_root(inode_root);

	if (IS_ERR(inode)) {

		ret = PTR_ERR(inode);

fs/btrfs/free-space-cache.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root, 
	 * sure NOFS is set to keep us from deadlocking.

	 */

	nofs_flag = memalloc_nofs_save();

	inode = btrfs_iget_path(fs_info->sb, &location, root, path);

	inode = btrfs_iget_path(fs_info->sb, location.objectid, root, path);

	btrfs_release_path(path);

	memalloc_nofs_restore(nofs_flag);

	if (IS_ERR(inode))

fs/btrfs/inode.c

+21 −19
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include "block-group.h"



struct btrfs_iget_args {

	struct btrfs_key *location;

	u64 ino;

	struct btrfs_root *root;

};
@@ -2978,7 +2978,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) 
		found_key.objectid = found_key.offset;

		found_key.type = BTRFS_INODE_ITEM_KEY;

		found_key.offset = 0;

		inode = btrfs_iget(fs_info->sb, &found_key, root);

		inode = btrfs_iget(fs_info->sb, last_objectid, root);

		ret = PTR_ERR_OR_ZERO(inode);

		if (ret && ret != -ENOENT)

			goto out;
@@ -5223,9 +5223,11 @@ static void inode_tree_del(struct inode *inode) 
static int btrfs_init_locked_inode(struct inode *inode, void *p)

{

	struct btrfs_iget_args *args = p;

	inode->i_ino = args->location->objectid;

	memcpy(&BTRFS_I(inode)->location, args->location,

	       sizeof(*args->location));



	inode->i_ino = args->ino;

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

	BTRFS_I(inode)->location.type = BTRFS_INODE_ITEM_KEY;

	BTRFS_I(inode)->location.offset = 0;

	BTRFS_I(inode)->root = btrfs_grab_root(args->root);

	BUG_ON(args->root && !BTRFS_I(inode)->root);

	return 0;
@@ -5234,19 +5236,19 @@ static int btrfs_init_locked_inode(struct inode *inode, void *p) 
static int btrfs_find_actor(struct inode *inode, void *opaque)

{

	struct btrfs_iget_args *args = opaque;

	return args->location->objectid == BTRFS_I(inode)->location.objectid &&



	return args->ino == BTRFS_I(inode)->location.objectid &&

		args->root == BTRFS_I(inode)->root;

}



static struct inode *btrfs_iget_locked(struct super_block *s,

				       struct btrfs_key *location,

static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,

				       struct btrfs_root *root)

{

	struct inode *inode;

	struct btrfs_iget_args args;

	unsigned long hashval = btrfs_inode_hash(location->objectid, root);

	unsigned long hashval = btrfs_inode_hash(ino, root);



	args.location = location;

	args.ino = ino;

	args.root = root;



	inode = iget5_locked(s, hashval, btrfs_find_actor,
@@ -5256,17 +5258,17 @@ static struct inode *btrfs_iget_locked(struct super_block *s, 
}



/*

 * Get an inode object given its location and corresponding root.

 * Get an inode object given its inode number and corresponding root.

 * Path can be preallocated to prevent recursing back to iget through

 * allocator. NULL is also valid but may require an additional allocation

 * later.

 */

struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location,

struct inode *btrfs_iget_path(struct super_block *s, u64 ino,

			      struct btrfs_root *root, struct btrfs_path *path)

{

	struct inode *inode;



	inode = btrfs_iget_locked(s, location, root);

	inode = btrfs_iget_locked(s, ino, root);

	if (!inode)

		return ERR_PTR(-ENOMEM);
@@ -5293,10 +5295,9 @@ struct inode *btrfs_iget_path(struct super_block *s, struct btrfs_key *location, 
	return inode;

}



struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,

			 struct btrfs_root *root)

struct inode *btrfs_iget(struct super_block *s, u64 ino, struct btrfs_root *root)

{

	return btrfs_iget_path(s, location, root, NULL);

	return btrfs_iget_path(s, ino, root, NULL);

}



static struct inode *new_simple_dir(struct super_block *s,
@@ -5365,7 +5366,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) 
		return ERR_PTR(ret);



	if (location.type == BTRFS_INODE_ITEM_KEY) {

		inode = btrfs_iget(dir->i_sb, &location, root);

		inode = btrfs_iget(dir->i_sb, location.objectid, root);

		if (IS_ERR(inode))

			return inode;
@@ -5389,7 +5390,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) 
		else

			inode = new_simple_dir(dir->i_sb, &location, sub_root);

	} else {

		inode = btrfs_iget(dir->i_sb, &location, sub_root);

		inode = btrfs_iget(dir->i_sb, location.objectid, sub_root);

	}

	if (root != sub_root)

		btrfs_put_root(sub_root);
@@ -5770,7 +5771,8 @@ int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index) 
static int btrfs_insert_inode_locked(struct inode *inode)

{

	struct btrfs_iget_args args;

	args.location = &BTRFS_I(inode)->location;



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

	args.root = BTRFS_I(inode)->root;



	return insert_inode_locked4(inode,

CRA Git | Maintained and supported by SUSTech CRA and CCSE