Commit e55cf7ca authored by David Sterba's avatar David Sterba
Browse files

btrfs: pass btrfs_inode to btrfs_add_delayed_iput 



The function is for internal interfaces so we should use the
btrfs_inode.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5fc24314

fs/btrfs/btrfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans, 
int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct btrfs_inode *inode);

int btrfs_orphan_cleanup(struct btrfs_root *root);

int btrfs_cont_expand(struct btrfs_inode *inode, loff_t oldsize, loff_t size);

void btrfs_add_delayed_iput(struct inode *inode);

void btrfs_add_delayed_iput(struct btrfs_inode *inode);

void btrfs_run_delayed_iputs(struct btrfs_fs_info *fs_info);

int btrfs_wait_on_delayed_iputs(struct btrfs_fs_info *fs_info);

int btrfs_prealloc_file_range(struct inode *inode, int mode,

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -3228,7 +3228,7 @@ static int extent_write_cache_pages(struct address_space *mapping, 
	if (wbc->range_cyclic || (wbc->nr_to_write > 0 && range_whole))

		mapping->writeback_index = done_index;



	btrfs_add_delayed_iput(inode);

	btrfs_add_delayed_iput(BTRFS_I(inode));

	return ret;

}

fs/btrfs/free-space-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int btrfs_remove_free_space_inode(struct btrfs_trans_handle *trans, 
	}

	ret = btrfs_orphan_add(trans, BTRFS_I(inode));

	if (ret) {

		btrfs_add_delayed_iput(inode);

		btrfs_add_delayed_iput(BTRFS_I(inode));

		goto out;

	}

	clear_nlink(inode);
@@ -274,7 +274,7 @@ int btrfs_remove_free_space_inode(struct btrfs_trans_handle *trans, 
		spin_unlock(&block_group->lock);

	}

	/* One for the lookup ref */

	btrfs_add_delayed_iput(inode);

	btrfs_add_delayed_iput(BTRFS_I(inode));



	key.objectid = BTRFS_FREE_SPACE_OBJECTID;

	key.type = 0;

fs/btrfs/inode.c

+9 −10
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ static noinline void async_cow_start(struct btrfs_work *work) 


	compressed_extents = compress_file_range(async_chunk);

	if (compressed_extents == 0) {

		btrfs_add_delayed_iput(&async_chunk->inode->vfs_inode);

		btrfs_add_delayed_iput(async_chunk->inode);

		async_chunk->inode = NULL;

	}

}
@@ -1533,7 +1533,7 @@ static noinline void async_cow_free(struct btrfs_work *work) 


	async_chunk = container_of(work, struct async_chunk, work);

	if (async_chunk->inode)

		btrfs_add_delayed_iput(&async_chunk->inode->vfs_inode);

		btrfs_add_delayed_iput(async_chunk->inode);

	if (async_chunk->blkcg_css)

		css_put(async_chunk->blkcg_css);
@@ -3016,7 +3016,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) 
	 * that could need flushing space. Recursing back to fixup worker would

	 * deadlock.

	 */

	btrfs_add_delayed_iput(&inode->vfs_inode);

	btrfs_add_delayed_iput(inode);

}



/*
@@ -3590,18 +3590,17 @@ unsigned int btrfs_verify_data_csum(struct btrfs_bio *bbio, 
 * the inode to the delayed iput machinery. Delayed iputs are processed at

 * transaction commit time/superblock commit/cleaner kthread.

 */

void btrfs_add_delayed_iput(struct inode *inode)

void btrfs_add_delayed_iput(struct btrfs_inode *inode)

{

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

	struct btrfs_inode *binode = BTRFS_I(inode);

	struct btrfs_fs_info *fs_info = inode->root->fs_info;



	if (atomic_add_unless(&inode->i_count, -1, 1))

	if (atomic_add_unless(&inode->vfs_inode.i_count, -1, 1))

		return;



	atomic_inc(&fs_info->nr_delayed_iputs);

	spin_lock(&fs_info->delayed_iput_lock);

	ASSERT(list_empty(&binode->delayed_iput));

	list_add_tail(&binode->delayed_iput, &fs_info->delayed_iputs);

	ASSERT(list_empty(&inode->delayed_iput));

	list_add_tail(&inode->delayed_iput, &fs_info->delayed_iputs);

	spin_unlock(&fs_info->delayed_iput_lock);

	if (!test_bit(BTRFS_FS_CLEANER_RUNNING, &fs_info->flags))

		wake_up_process(fs_info->cleaner_kthread);
@@ -9661,7 +9660,7 @@ static int start_delalloc_inodes(struct btrfs_root *root, 
					 &work->work);

		} else {

			ret = filemap_fdatawrite_wbc(inode->i_mapping, wbc);

			btrfs_add_delayed_iput(inode);

			btrfs_add_delayed_iput(BTRFS_I(inode));

			if (ret || wbc->nr_to_write <= 0)

				goto out;

		}

fs/btrfs/ordered-data.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry) 
		ASSERT(list_empty(&entry->log_list));

		ASSERT(RB_EMPTY_NODE(&entry->rb_node));

		if (entry->inode)

			btrfs_add_delayed_iput(entry->inode);

			btrfs_add_delayed_iput(BTRFS_I(entry->inode));

		while (!list_empty(&entry->list)) {

			cur = entry->list.next;

			sum = list_entry(cur, struct btrfs_ordered_sum, list);