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

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

btrfs: Make btrfs_remove_delayed_node take btrfs_inode 



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

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1286,15 +1286,15 @@ int btrfs_commit_inode_delayed_inode(struct inode *inode) 
	return ret;

}



void btrfs_remove_delayed_node(struct inode *inode)

void btrfs_remove_delayed_node(struct btrfs_inode *inode)

{

	struct btrfs_delayed_node *delayed_node;



	delayed_node = READ_ONCE(BTRFS_I(inode)->delayed_node);

	delayed_node = READ_ONCE(inode->delayed_node);

	if (!delayed_node)

		return;



	BTRFS_I(inode)->delayed_node = NULL;

	inode->delayed_node = NULL;

	btrfs_release_delayed_node(delayed_node);

}

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info); 
int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,

				     struct inode *inode);

/* Used for evicting the inode. */

void btrfs_remove_delayed_node(struct inode *inode);

void btrfs_remove_delayed_node(struct btrfs_inode *inode);

void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode);

int btrfs_commit_inode_delayed_inode(struct inode *inode);

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5395,7 +5395,7 @@ void btrfs_evict_inode(struct inode *inode) 
	btrfs_end_transaction(trans);

	btrfs_btree_balance_dirty(fs_info);

no_delete:

	btrfs_remove_delayed_node(inode);

	btrfs_remove_delayed_node(BTRFS_I(inode));

	clear_inode(inode);

}