summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Borisov <n.borisov.lkml@gmail.com>2017-01-17 17:31:33 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:54 -0500
commita491abb2e730955df1620165a193678fd775c2d6 (patch)
tree185f02fbea288e25306f866902a8b048e4dbb4ea
parent49f34d1f968fb1e00dd782a2ea27e9910629a3f6 (diff)
btrfs: Make btrfs_del_inode_ref take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/inode.c2
-rw-r--r--fs/btrfs/tree-log.c10
-rw-r--r--fs/btrfs/tree-log.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 9a2b55eb6f73..192745774f0e 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4053,7 +4053,7 @@ skip_backref:
4053 } 4053 }
4054 4054
4055 ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len, 4055 ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len,
4056 inode, dir_ino); 4056 BTRFS_I(inode), dir_ino);
4057 if (ret != 0 && ret != -ENOENT) { 4057 if (ret != 0 && ret != -ENOENT) {
4058 btrfs_abort_transaction(trans, ret); 4058 btrfs_abort_transaction(trans, ret);
4059 goto err; 4059 goto err;
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index caa8d886b4ae..a7705173150e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3192,25 +3192,25 @@ out_unlock:
3192int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, 3192int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
3193 struct btrfs_root *root, 3193 struct btrfs_root *root,
3194 const char *name, int name_len, 3194 const char *name, int name_len,
3195 struct inode *inode, u64 dirid) 3195 struct btrfs_inode *inode, u64 dirid)
3196{ 3196{
3197 struct btrfs_fs_info *fs_info = root->fs_info; 3197 struct btrfs_fs_info *fs_info = root->fs_info;
3198 struct btrfs_root *log; 3198 struct btrfs_root *log;
3199 u64 index; 3199 u64 index;
3200 int ret; 3200 int ret;
3201 3201
3202 if (BTRFS_I(inode)->logged_trans < trans->transid) 3202 if (inode->logged_trans < trans->transid)
3203 return 0; 3203 return 0;
3204 3204
3205 ret = join_running_log_trans(root); 3205 ret = join_running_log_trans(root);
3206 if (ret) 3206 if (ret)
3207 return 0; 3207 return 0;
3208 log = root->log_root; 3208 log = root->log_root;
3209 mutex_lock(&BTRFS_I(inode)->log_mutex); 3209 mutex_lock(&inode->log_mutex);
3210 3210
3211 ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(BTRFS_I(inode)), 3211 ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode),
3212 dirid, &index); 3212 dirid, &index);
3213 mutex_unlock(&BTRFS_I(inode)->log_mutex); 3213 mutex_unlock(&inode->log_mutex);
3214 if (ret == -ENOSPC) { 3214 if (ret == -ENOSPC) {
3215 btrfs_set_log_full_commit(fs_info, trans); 3215 btrfs_set_log_full_commit(fs_info, trans);
3216 ret = 0; 3216 ret = 0;
diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 41679397ce6e..483027f9a7f4 100644
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -76,7 +76,7 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
76int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, 76int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
77 struct btrfs_root *root, 77 struct btrfs_root *root,
78 const char *name, int name_len, 78 const char *name, int name_len,
79 struct inode *inode, u64 dirid); 79 struct btrfs_inode *inode, u64 dirid);
80void btrfs_end_log_trans(struct btrfs_root *root); 80void btrfs_end_log_trans(struct btrfs_root *root);
81int btrfs_pin_log_trans(struct btrfs_root *root); 81int btrfs_pin_log_trans(struct btrfs_root *root);
82void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 82void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,