diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0455ee2d9c89..45134a1519a6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -9677,11 +9677,11 @@ out_fail: | |||
9677 | * allow the tasks to sync it. | 9677 | * allow the tasks to sync it. |
9678 | */ | 9678 | */ |
9679 | if (ret && (root_log_pinned || dest_log_pinned)) { | 9679 | if (ret && (root_log_pinned || dest_log_pinned)) { |
9680 | if (btrfs_inode_in_log(old_dir, fs_info->generation) || | 9680 | if (btrfs_inode_in_log(BTRFS_I(old_dir), fs_info->generation) || |
9681 | btrfs_inode_in_log(new_dir, fs_info->generation) || | 9681 | btrfs_inode_in_log(BTRFS_I(new_dir), fs_info->generation) || |
9682 | btrfs_inode_in_log(old_inode, fs_info->generation) || | 9682 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || |
9683 | (new_inode && | 9683 | (new_inode && |
9684 | btrfs_inode_in_log(new_inode, fs_info->generation))) | 9684 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) |
9685 | btrfs_set_log_full_commit(fs_info, trans); | 9685 | btrfs_set_log_full_commit(fs_info, trans); |
9686 | 9686 | ||
9687 | if (root_log_pinned) { | 9687 | if (root_log_pinned) { |
@@ -9953,11 +9953,11 @@ out_fail: | |||
9953 | * allow the tasks to sync it. | 9953 | * allow the tasks to sync it. |
9954 | */ | 9954 | */ |
9955 | if (ret && log_pinned) { | 9955 | if (ret && log_pinned) { |
9956 | if (btrfs_inode_in_log(old_dir, fs_info->generation) || | 9956 | if (btrfs_inode_in_log(BTRFS_I(old_dir), fs_info->generation) || |
9957 | btrfs_inode_in_log(new_dir, fs_info->generation) || | 9957 | btrfs_inode_in_log(BTRFS_I(new_dir), fs_info->generation) || |
9958 | btrfs_inode_in_log(old_inode, fs_info->generation) || | 9958 | btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) || |
9959 | (new_inode && | 9959 | (new_inode && |
9960 | btrfs_inode_in_log(new_inode, fs_info->generation))) | 9960 | btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation))) |
9961 | btrfs_set_log_full_commit(fs_info, trans); | 9961 | btrfs_set_log_full_commit(fs_info, trans); |
9962 | 9962 | ||
9963 | btrfs_end_log_trans(root); | 9963 | btrfs_end_log_trans(root); |