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

Btrfs: remove redundant btrfs_balance_delayed_items

Browse Source 
In functions like btrfs_create(), we run both
btrfs_balance_delayed_items() and btrfs_btree_balance_dirty() after
the operation, but btrfs_btree_balance_dirty() is surely going to run
btrfs_balance_delayed_items().

This keeps only btrfs_btree_balance_dirty().

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Liu Bo
2017-10-20 17:53:41 -06:00
committed by David Sterba
parent 0c5b9b5d9a
commit 1805f2ca3f
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/inode.c
View File

@@ -6560,7 +6560,6 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry,
out_unlock: out_unlock:
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
btrfs_balance_delayed_items(fs_info);
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);
if (drop_inode) { if (drop_inode) {
inode_dec_link_count(inode); inode_dec_link_count(inode);
@@ -6641,7 +6640,6 @@ out_unlock:
inode_dec_link_count(inode); inode_dec_link_count(inode);
iput(inode); iput(inode);
} }
btrfs_balance_delayed_items(fs_info);
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);
return err; return err;
@@ -6716,7 +6714,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
btrfs_log_new_name(trans, BTRFS_I(inode), NULL, parent); btrfs_log_new_name(trans, BTRFS_I(inode), NULL, parent);
} }
btrfs_balance_delayed_items(fs_info);
fail: fail:
if (trans) if (trans)
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
@@ -6794,7 +6791,6 @@ out_fail:
inode_dec_link_count(inode); inode_dec_link_count(inode);
iput(inode); iput(inode);
} }
btrfs_balance_delayed_items(fs_info);
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);
return err; return err;
@@ -10688,7 +10684,6 @@ out:
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
if (ret) if (ret)
iput(inode); iput(inode);
btrfs_balance_delayed_items(fs_info);
btrfs_btree_balance_dirty(fs_info); btrfs_btree_balance_dirty(fs_info);
return ret; return ret;