Commit 9950c31a authored by David Sterba's avatar David Sterba
Browse files

btrfs: rename inode number parameter passed to btrfs_check_dir_item_collision() 



The name 'dir' is misleading as it's the inode number of the directory,
so rename it accordingly.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8320febc

fs/btrfs/dir-item.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, 
	return di;

}



int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,

				   const struct fscrypt_str *name)

{

	int ret;
@@ -242,7 +242,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, 
	if (!path)

		return -ENOMEM;



	key.objectid = dir;

	key.objectid = dir_ino;

	key.type = BTRFS_DIR_ITEM_KEY;

	key.offset = btrfs_name_hash(name->name, name->len);

fs/btrfs/dir-item.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct btrfs_inode; 
struct btrfs_root;

struct btrfs_trans_handle;



int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,

			  const struct fscrypt_str *name);

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

			  const struct fscrypt_str *name, struct btrfs_inode *dir,