diff options
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 434457794c27..fac5fd1cc786 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -853,7 +853,6 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, | |||
| 853 | struct btrfs_inode *dir, | 853 | struct btrfs_inode *dir, |
| 854 | struct btrfs_dir_item *di) | 854 | struct btrfs_dir_item *di) |
| 855 | { | 855 | { |
| 856 | struct btrfs_fs_info *fs_info = root->fs_info; | ||
| 857 | struct inode *inode; | 856 | struct inode *inode; |
| 858 | char *name; | 857 | char *name; |
| 859 | int name_len; | 858 | int name_len; |
| @@ -887,7 +886,7 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, | |||
| 887 | if (ret) | 886 | if (ret) |
| 888 | goto out; | 887 | goto out; |
| 889 | else | 888 | else |
| 890 | ret = btrfs_run_delayed_items(trans, fs_info); | 889 | ret = btrfs_run_delayed_items(trans); |
| 891 | out: | 890 | out: |
| 892 | kfree(name); | 891 | kfree(name); |
| 893 | iput(inode); | 892 | iput(inode); |
| @@ -1007,7 +1006,6 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, | |||
| 1007 | u64 ref_index, char *name, int namelen, | 1006 | u64 ref_index, char *name, int namelen, |
| 1008 | int *search_done) | 1007 | int *search_done) |
| 1009 | { | 1008 | { |
| 1010 | struct btrfs_fs_info *fs_info = root->fs_info; | ||
| 1011 | int ret; | 1009 | int ret; |
| 1012 | char *victim_name; | 1010 | char *victim_name; |
| 1013 | int victim_name_len; | 1011 | int victim_name_len; |
| @@ -1065,7 +1063,7 @@ again: | |||
| 1065 | kfree(victim_name); | 1063 | kfree(victim_name); |
| 1066 | if (ret) | 1064 | if (ret) |
| 1067 | return ret; | 1065 | return ret; |
| 1068 | ret = btrfs_run_delayed_items(trans, fs_info); | 1066 | ret = btrfs_run_delayed_items(trans); |
| 1069 | if (ret) | 1067 | if (ret) |
| 1070 | return ret; | 1068 | return ret; |
| 1071 | *search_done = 1; | 1069 | *search_done = 1; |
| @@ -1136,8 +1134,7 @@ again: | |||
| 1136 | victim_name_len); | 1134 | victim_name_len); |
| 1137 | if (!ret) | 1135 | if (!ret) |
| 1138 | ret = btrfs_run_delayed_items( | 1136 | ret = btrfs_run_delayed_items( |
| 1139 | trans, | 1137 | trans); |
| 1140 | fs_info); | ||
| 1141 | } | 1138 | } |
| 1142 | iput(victim_parent); | 1139 | iput(victim_parent); |
| 1143 | kfree(victim_name); | 1140 | kfree(victim_name); |
| @@ -2098,7 +2095,6 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, | |||
| 2098 | struct inode *dir, | 2095 | struct inode *dir, |
| 2099 | struct btrfs_key *dir_key) | 2096 | struct btrfs_key *dir_key) |
| 2100 | { | 2097 | { |
| 2101 | struct btrfs_fs_info *fs_info = root->fs_info; | ||
| 2102 | int ret; | 2098 | int ret; |
| 2103 | struct extent_buffer *eb; | 2099 | struct extent_buffer *eb; |
| 2104 | int slot; | 2100 | int slot; |
| @@ -2162,7 +2158,7 @@ again: | |||
| 2162 | ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), | 2158 | ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir), |
| 2163 | BTRFS_I(inode), name, name_len); | 2159 | BTRFS_I(inode), name, name_len); |
| 2164 | if (!ret) | 2160 | if (!ret) |
| 2165 | ret = btrfs_run_delayed_items(trans, fs_info); | 2161 | ret = btrfs_run_delayed_items(trans); |
| 2166 | kfree(name); | 2162 | kfree(name); |
| 2167 | iput(inode); | 2163 | iput(inode); |
| 2168 | if (ret) | 2164 | if (ret) |