Skip to content

Commit 50bed70

Browse files
committed
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. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 841c20a commit 50bed70

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/btrfs/dir-item.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
227227
return di;
228228
}
229229

230-
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
230+
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,
231231
const struct fscrypt_str *name)
232232
{
233233
int ret;
@@ -242,7 +242,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
242242
if (!path)
243243
return -ENOMEM;
244244

245-
key.objectid = dir;
245+
key.objectid = dir_ino;
246246
key.type = BTRFS_DIR_ITEM_KEY;
247247
key.offset = btrfs_name_hash(name->name, name->len);
248248

fs/btrfs/dir-item.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct btrfs_inode;
1414
struct btrfs_root;
1515
struct btrfs_trans_handle;
1616

17-
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
17+
int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir_ino,
1818
const struct fscrypt_str *name);
1919
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,
2020
const struct fscrypt_str *name, struct btrfs_inode *dir,

0 commit comments

Comments
 (0)