iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: Make drop_one_dir_item take btrfs_inode

Browse Source 
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov
2017-01-18 00:31:45 +02:00
committed by David Sterba
parent 4ec5934e43
commit 207e7d92aa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/tree-log.c
View File

@@ -843,7 +843,7 @@ out:
static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
struct inode *dir, struct btrfs_inode *dir,
struct btrfs_dir_item *di) struct btrfs_dir_item *di)
{ {
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
@@ -875,8 +875,8 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
if (ret) if (ret)
goto out; goto out;
ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), BTRFS_I(inode), ret = btrfs_unlink_inode(trans, root, dir, BTRFS_I(inode), name,
name, name_len); name_len);
if (ret) if (ret)
goto out; goto out;
else else
@@ -1152,7 +1152,7 @@ next:
di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(BTRFS_I(dir)),
ref_index, name, namelen, 0); ref_index, name, namelen, 0);
if (di && !IS_ERR(di)) { if (di && !IS_ERR(di)) {
ret = drop_one_dir_item(trans, root, path, dir, di); ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
if (ret) if (ret)
return ret; return ret;
} }
@@ -1162,7 +1162,7 @@ next:
di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)), di = btrfs_lookup_dir_item(trans, root, path, btrfs_ino(BTRFS_I(dir)),
name, namelen, 0); name, namelen, 0);
if (di && !IS_ERR(di)) { if (di && !IS_ERR(di)) {
ret = drop_one_dir_item(trans, root, path, dir, di); ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), di);
if (ret) if (ret)
return ret; return ret;
} }
@@ -1770,7 +1770,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
if (!exists) if (!exists)
goto out; goto out;
ret = drop_one_dir_item(trans, root, path, dir, dst_di); ret = drop_one_dir_item(trans, root, path, BTRFS_I(dir), dst_di);
if (ret) if (ret)
goto out; goto out;