Btrfs: remove redundant btrfs_balance_delayed_items (1805f2ca) · Commits · 戴 / test

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>

fs/btrfs/inode.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -6560,7 +6560,6 @@ static int btrfs_mknod(struct inode dir, struct dentry dentry,

		out_unlock:
		btrfs_end_transaction(trans);
		btrfs_balance_delayed_items(fs_info);
		btrfs_btree_balance_dirty(fs_info);
		if (drop_inode) {
		inode_dec_link_count(inode);
		@@ -6641,7 +6640,6 @@ out_unlock:
		inode_dec_link_count(inode);
		iput(inode);
		}
		btrfs_balance_delayed_items(fs_info);
		btrfs_btree_balance_dirty(fs_info);
		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_balance_delayed_items(fs_info);
		fail:
		if (trans)
		btrfs_end_transaction(trans);
		@@ -6794,7 +6791,6 @@ out_fail:
		inode_dec_link_count(inode);
		iput(inode);
		}
		btrfs_balance_delayed_items(fs_info);
		btrfs_btree_balance_dirty(fs_info);
		return err;

		@@ -10688,7 +10684,6 @@ out:
		btrfs_end_transaction(trans);
		if (ret)
		iput(inode);
		btrfs_balance_delayed_items(fs_info);
		btrfs_btree_balance_dirty(fs_info);
		return ret;

Admin message