Commit f3fbcaef authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_delayed_update_inode take btrfs_inode 



Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 72e7e6ed

fs/btrfs/delayed-inode.c

+7 −5
Original line number Diff line number Diff line
@@ -1815,27 +1815,29 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev) 
}



int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root, struct inode *inode)

			       struct btrfs_root *root,

			       struct btrfs_inode *inode)

{

	struct btrfs_delayed_node *delayed_node;

	int ret = 0;



	delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(inode));

	delayed_node = btrfs_get_or_create_delayed_node(inode);

	if (IS_ERR(delayed_node))

		return PTR_ERR(delayed_node);



	mutex_lock(&delayed_node->mutex);

	if (test_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &delayed_node->flags)) {

		fill_stack_inode_item(trans, &delayed_node->inode_item, inode);

		fill_stack_inode_item(trans, &delayed_node->inode_item,

				      &inode->vfs_inode);

		goto release_node;

	}



	ret = btrfs_delayed_inode_reserve_metadata(trans, root, BTRFS_I(inode),

	ret = btrfs_delayed_inode_reserve_metadata(trans, root, inode,

						   delayed_node);

	if (ret)

		goto release_node;



	fill_stack_inode_item(trans, &delayed_node->inode_item, inode);

	fill_stack_inode_item(trans, &delayed_node->inode_item, &inode->vfs_inode);

	set_bit(BTRFS_DELAYED_NODE_INODE_DIRTY, &delayed_node->flags);

	delayed_node->count++;

	atomic_inc(&root->fs_info->delayed_root->items);

fs/btrfs/delayed-inode.h

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode); 




int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root, struct inode *inode);

			       struct btrfs_root *root,

			       struct btrfs_inode *inode);

int btrfs_fill_inode(struct inode *inode, u32 *rdev);

int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3674,7 +3674,7 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans, 
	    && !test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) {

		btrfs_update_root_times(trans, root);



		ret = btrfs_delayed_update_inode(trans, root, inode);

		ret = btrfs_delayed_update_inode(trans, root, BTRFS_I(inode));

		if (!ret)

			btrfs_set_inode_last_trans(trans, BTRFS_I(inode));

		return ret;