|
@@ -3192,25 +3192,25 @@ out_unlock:
|
|
|
int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
|
|
|
struct btrfs_root *root,
|
|
|
const char *name, int name_len,
|
|
|
- struct inode *inode, u64 dirid)
|
|
|
+ struct btrfs_inode *inode, u64 dirid)
|
|
|
{
|
|
|
struct btrfs_fs_info *fs_info = root->fs_info;
|
|
|
struct btrfs_root *log;
|
|
|
u64 index;
|
|
|
int ret;
|
|
|
|
|
|
- if (BTRFS_I(inode)->logged_trans < trans->transid)
|
|
|
+ if (inode->logged_trans < trans->transid)
|
|
|
return 0;
|
|
|
|
|
|
ret = join_running_log_trans(root);
|
|
|
if (ret)
|
|
|
return 0;
|
|
|
log = root->log_root;
|
|
|
- mutex_lock(&BTRFS_I(inode)->log_mutex);
|
|
|
+ mutex_lock(&inode->log_mutex);
|
|
|
|
|
|
- ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(BTRFS_I(inode)),
|
|
|
+ ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode),
|
|
|
dirid, &index);
|
|
|
- mutex_unlock(&BTRFS_I(inode)->log_mutex);
|
|
|
+ mutex_unlock(&inode->log_mutex);
|
|
|
if (ret == -ENOSPC) {
|
|
|
btrfs_set_log_full_commit(fs_info, trans);
|
|
|
ret = 0;
|