xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: Make btrfs_inode_in_log take btrfs_inode

Browse Source 
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov
2017-01-18 00:31:30 +02:00
committed by David Sterba
parent 436635571b
commit 0f8939b8ac
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/btrfs/inode.c
View File

@@ -9677,11 +9677,11 @@ out_fail:
* allow the tasks to sync it.
*/
if (ret && (root_log_pinned || dest_log_pinned)) {
if (btrfs_inode_in_log(old_dir, fs_info->generation) ||
btrfs_inode_in_log(new_dir, fs_info->generation) ||
btrfs_inode_in_log(old_inode, fs_info->generation) ||
if (btrfs_inode_in_log(BTRFS_I(old_dir), fs_info->generation) ||
btrfs_inode_in_log(BTRFS_I(new_dir), fs_info->generation) ||
btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) ||
(new_inode &&
btrfs_inode_in_log(new_inode, fs_info->generation)))
btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation)))
btrfs_set_log_full_commit(fs_info, trans);
if (root_log_pinned) {
@@ -9953,11 +9953,11 @@ out_fail:
* allow the tasks to sync it.
*/
if (ret && log_pinned) {
if (btrfs_inode_in_log(old_dir, fs_info->generation) ||
btrfs_inode_in_log(new_dir, fs_info->generation) ||
btrfs_inode_in_log(old_inode, fs_info->generation) ||
if (btrfs_inode_in_log(BTRFS_I(old_dir), fs_info->generation) ||
btrfs_inode_in_log(BTRFS_I(new_dir), fs_info->generation) ||
btrfs_inode_in_log(BTRFS_I(old_inode), fs_info->generation) ||
(new_inode &&
btrfs_inode_in_log(new_inode, fs_info->generation)))
btrfs_inode_in_log(BTRFS_I(new_inode), fs_info->generation)))
btrfs_set_log_full_commit(fs_info, trans);
btrfs_end_log_trans(root);