diff options
| author | Nikolay Borisov <n.borisov.lkml@gmail.com> | 2017-01-17 17:31:44 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-14 09:50:56 -0500 |
| commit | 4ec5934e43cabd16d3d61dd095e182c32e7433d5 (patch) | |
| tree | f80fafaf25999ac7877e8f748ddc8923c5e6feed /fs/btrfs/tree-log.c | |
| parent | 51cc0d322746301bf29455c5ce0cd628cd083420 (diff) | |
btrfs: Make btrfs_unlink_inode take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 20875fd90f98..691ef8e40e85 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -875,7 +875,8 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, | |||
| 875 | if (ret) | 875 | if (ret) |
| 876 | goto out; | 876 | goto out; |
| 877 | 877 | ||
| 878 | ret = btrfs_unlink_inode(trans, root, dir, inode, name, name_len); | 878 | ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), BTRFS_I(inode), |
| 879 | name, name_len); | ||
| 879 | if (ret) | 880 | if (ret) |
| 880 | goto out; | 881 | goto out; |
| 881 | else | 882 | else |
| @@ -1050,9 +1051,9 @@ again: | |||
| 1050 | inc_nlink(inode); | 1051 | inc_nlink(inode); |
| 1051 | btrfs_release_path(path); | 1052 | btrfs_release_path(path); |
| 1052 | 1053 | ||
| 1053 | ret = btrfs_unlink_inode(trans, root, dir, | 1054 | ret = btrfs_unlink_inode(trans, root, |
| 1054 | inode, victim_name, | 1055 | BTRFS_I(dir), BTRFS_I(inode), |
| 1055 | victim_name_len); | 1056 | victim_name, victim_name_len); |
| 1056 | kfree(victim_name); | 1057 | kfree(victim_name); |
| 1057 | if (ret) | 1058 | if (ret) |
| 1058 | return ret; | 1059 | return ret; |
| @@ -1121,10 +1122,10 @@ again: | |||
| 1121 | btrfs_release_path(path); | 1122 | btrfs_release_path(path); |
| 1122 | 1123 | ||
| 1123 | ret = btrfs_unlink_inode(trans, root, | 1124 | ret = btrfs_unlink_inode(trans, root, |
| 1124 | victim_parent, | 1125 | BTRFS_I(victim_parent), |
| 1125 | inode, | 1126 | BTRFS_I(inode), |
| 1126 | victim_name, | 1127 | victim_name, |
| 1127 | victim_name_len); | 1128 | victim_name_len); |
| 1128 | if (!ret) | 1129 | if (!ret) |
| 1129 | ret = btrfs_run_delayed_items( | 1130 | ret = btrfs_run_delayed_items( |
| 1130 | trans, | 1131 | trans, |
| @@ -2052,8 +2053,8 @@ again: | |||
| 2052 | } | 2053 | } |
| 2053 | 2054 | ||
| 2054 | inc_nlink(inode); | 2055 | inc_nlink(inode); |
| 2055 | ret = btrfs_unlink_inode(trans, root, dir, inode, | 2056 | ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), |
| 2056 | name, name_len); | 2057 | BTRFS_I(inode), name, name_len); |
| 2057 | if (!ret) | 2058 | if (!ret) |
| 2058 | ret = btrfs_run_delayed_items(trans, fs_info); | 2059 | ret = btrfs_run_delayed_items(trans, fs_info); |
| 2059 | kfree(name); | 2060 | kfree(name); |