diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index baa80d808806..b998e288366a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -9454,7 +9454,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, | |||
9454 | /* Reference for the source. */ | 9454 | /* Reference for the source. */ |
9455 | if (old_ino == BTRFS_FIRST_FREE_OBJECTID) { | 9455 | if (old_ino == BTRFS_FIRST_FREE_OBJECTID) { |
9456 | /* force full log commit if subvolume involved. */ | 9456 | /* force full log commit if subvolume involved. */ |
9457 | btrfs_set_log_full_commit(fs_info, trans); | 9457 | btrfs_set_log_full_commit(trans); |
9458 | } else { | 9458 | } else { |
9459 | btrfs_pin_log_trans(root); | 9459 | btrfs_pin_log_trans(root); |
9460 | root_log_pinned = true; | 9460 | root_log_pinned = true; |
@@ -9471,7 +9471,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, | |||
9471 | /* And now for the dest. */ | 9471 | /* And now for the dest. */ |
9472 | if (new_ino == BTRFS_FIRST_FREE_OBJECTID) { | 9472 | if (new_ino == BTRFS_FIRST_FREE_OBJECTID) { |
9473 | /* force full log commit if subvolume involved. */ | 9473 | /* force full log commit if subvolume involved. */ |
9474 | btrfs_set_log_full_commit(fs_info, trans); | 9474 | btrfs_set_log_full_commit(trans); |
9475 | } else { | 9475 | } else { |
9476 | btrfs_pin_log_trans(dest); | 9476 | btrfs_pin_log_trans(dest); |
9477 | dest_log_pinned = true; | 9477 | dest_log_pinned = true; |
@@ -9607,7 +9607,7 @@ out_fail: | |||
9607 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || | 9607 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || |
9608 | (new_inode && | 9608 | (new_inode && |
9609 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) | 9609 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) |
9610 | btrfs_set_log_full_commit(fs_info, trans); | 9610 | btrfs_set_log_full_commit(trans); |
9611 | 9611 | ||
9612 | if (root_log_pinned) { | 9612 | if (root_log_pinned) { |
9613 | btrfs_end_log_trans(root); | 9613 | btrfs_end_log_trans(root); |
@@ -9793,7 +9793,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
9793 | BTRFS_I(old_inode)->dir_index = 0ULL; | 9793 | BTRFS_I(old_inode)->dir_index = 0ULL; |
9794 | if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) { | 9794 | if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) { |
9795 | /* force full log commit if subvolume involved. */ | 9795 | /* force full log commit if subvolume involved. */ |
9796 | btrfs_set_log_full_commit(fs_info, trans); | 9796 | btrfs_set_log_full_commit(trans); |
9797 | } else { | 9797 | } else { |
9798 | btrfs_pin_log_trans(root); | 9798 | btrfs_pin_log_trans(root); |
9799 | log_pinned = true; | 9799 | log_pinned = true; |
@@ -9914,7 +9914,7 @@ out_fail: | |||
9914 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || | 9914 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || |
9915 | (new_inode && | 9915 | (new_inode && |
9916 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) | 9916 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) |
9917 | btrfs_set_log_full_commit(fs_info, trans); | 9917 | btrfs_set_log_full_commit(trans); |
9918 | 9918 | ||
9919 | btrfs_end_log_trans(root); | 9919 | btrfs_end_log_trans(root); |
9920 | log_pinned = false; | 9920 | log_pinned = false; |