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

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

btrfs: Make btrfs_kill_delayed_inode_items take btrfs_inode 



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

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1931,11 +1931,11 @@ static void __btrfs_kill_delayed_node(struct btrfs_delayed_node *delayed_node) 
	mutex_unlock(&delayed_node->mutex);

}



void btrfs_kill_delayed_inode_items(struct inode *inode)

void btrfs_kill_delayed_inode_items(struct btrfs_inode *inode)

{

	struct btrfs_delayed_node *delayed_node;



	delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));

	delayed_node = btrfs_get_delayed_node(inode);

	if (!delayed_node)

		return;

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 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_kill_delayed_inode_items(struct 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
@@ -4425,7 +4425,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
	 * items.

	 */

	if (min_type == 0 && root == BTRFS_I(inode)->root)

		btrfs_kill_delayed_inode_items(inode);

		btrfs_kill_delayed_inode_items(BTRFS_I(inode));



	key.objectid = ino;

	key.offset = (u64)-1;