Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

btrfs: Make btrfs_delayed_delete_inode_ref take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e67bbbb9

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1854,9 +1854,9 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, 
	return ret;

}



int btrfs_delayed_delete_inode_ref(struct inode *inode)

int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_delayed_node *delayed_node;



	/*
@@ -1867,7 +1867,7 @@ int btrfs_delayed_delete_inode_ref(struct inode *inode) 
	if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags))

		return -EAGAIN;



	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);

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int btrfs_commit_inode_delayed_inode(struct inode *inode); 
int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root, struct inode *inode);

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

int btrfs_delayed_delete_inode_ref(struct inode *inode);

int btrfs_delayed_delete_inode_ref(struct btrfs_inode *inode);



/* Used for drop dead root */

void btrfs_kill_all_delayed_nodes(struct btrfs_root *root);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4029,7 +4029,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	 * we update the inode item.

	 */

	if (BTRFS_I(inode)->dir_index) {

		ret = btrfs_delayed_delete_inode_ref(inode);

		ret = btrfs_delayed_delete_inode_ref(BTRFS_I(inode));

		if (!ret) {

			index = BTRFS_I(inode)->dir_index;

			goto skip_backref;