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

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

btrfs: Make btrfs_commit_inode_delayed_inode take btrfs_inode 



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

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1231,11 +1231,11 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 
	return ret;

}



int btrfs_commit_inode_delayed_inode(struct inode *inode)

int btrfs_commit_inode_delayed_inode(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_trans_handle *trans;

	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(BTRFS_I(inode));

	struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);

	struct btrfs_path *path;

	struct btrfs_block_rsv *block_rsv;

	int ret;

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, 
/* Used for evicting the 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);

int btrfs_commit_inode_delayed_inode(struct btrfs_inode *inode);





int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5270,7 +5270,7 @@ void btrfs_evict_inode(struct inode *inode) 
		goto no_delete;

	}



	ret = btrfs_commit_inode_delayed_inode(inode);

	ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode));

	if (ret) {

		btrfs_orphan_del(NULL, inode);

		goto no_delete;

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -4658,7 +4658,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, 
	    BTRFS_I(inode)->generation > fs_info->last_trans_committed)

		ret = btrfs_commit_inode_delayed_items(trans, inode);

	else

		ret = btrfs_commit_inode_delayed_inode(inode);

		ret = btrfs_commit_inode_delayed_inode(BTRFS_I(inode));



	if (ret) {

		btrfs_free_path(path);