summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
authorNikolay Borisov <n.borisov.lkml@gmail.com>2017-01-17 17:31:32 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:54 -0500
commit49f34d1f968fb1e00dd782a2ea27e9910629a3f6 (patch)
treee7e78739796af01775b231343c2b0acc073b82f9 /fs/btrfs/tree-log.c
parent9ca5fbfbb92e91933510f0903b2492e5e7b45464 (diff)
btrfs: Make btrfs_del_dir_entries_in_log 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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index df822908f2be..caa8d886b4ae 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3084,7 +3084,7 @@ int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,
3084int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, 3084int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
3085 struct btrfs_root *root, 3085 struct btrfs_root *root,
3086 const char *name, int name_len, 3086 const char *name, int name_len,
3087 struct inode *dir, u64 index) 3087 struct btrfs_inode *dir, u64 index)
3088{ 3088{
3089 struct btrfs_root *log; 3089 struct btrfs_root *log;
3090 struct btrfs_dir_item *di; 3090 struct btrfs_dir_item *di;
@@ -3092,16 +3092,16 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
3092 int ret; 3092 int ret;
3093 int err = 0; 3093 int err = 0;
3094 int bytes_del = 0; 3094 int bytes_del = 0;
3095 u64 dir_ino = btrfs_ino(BTRFS_I(dir)); 3095 u64 dir_ino = btrfs_ino(dir);
3096 3096
3097 if (BTRFS_I(dir)->logged_trans < trans->transid) 3097 if (dir->logged_trans < trans->transid)
3098 return 0; 3098 return 0;
3099 3099
3100 ret = join_running_log_trans(root); 3100 ret = join_running_log_trans(root);
3101 if (ret) 3101 if (ret)
3102 return 0; 3102 return 0;
3103 3103
3104 mutex_lock(&BTRFS_I(dir)->log_mutex); 3104 mutex_lock(&dir->log_mutex);
3105 3105
3106 log = root->log_root; 3106 log = root->log_root;
3107 path = btrfs_alloc_path(); 3107 path = btrfs_alloc_path();
@@ -3176,7 +3176,7 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
3176fail: 3176fail:
3177 btrfs_free_path(path); 3177 btrfs_free_path(path);
3178out_unlock: 3178out_unlock:
3179 mutex_unlock(&BTRFS_I(dir)->log_mutex); 3179 mutex_unlock(&dir->log_mutex);
3180 if (ret == -ENOSPC) { 3180 if (ret == -ENOSPC) {
3181 btrfs_set_log_full_commit(root->fs_info, trans); 3181 btrfs_set_log_full_commit(root->fs_info, trans);
3182 ret = 0; 3182 ret = 0;