btrfs: use inode from io_ctl in io_ctl_prepare_pages (831fa14f) · Commits · 戴 / test

io_ctl_prepare_pages() gets a 'struct btrfs_io_ctl' as well as a 'struct inode', but btrfs_io_ctl::inode points to the same struct inode as this is assgined in io_ctl_init(). Use the inode form io_ctl to reduce the arguments of io_ctl_prepare_pages. Reviewed-by:

Josef Bacik <josef@toxicpanda.com> Signed-off-by:

Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/free-space-cache.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -371,10 +371,10 @@ static void io_ctl_drop_pages(struct btrfs_io_ctl *io_ctl)
		}
		}

		static int io_ctl_prepare_pages(struct btrfs_io_ctl io_ctl, struct inode inode,
		int uptodate)
		static int io_ctl_prepare_pages(struct btrfs_io_ctl *io_ctl, int uptodate)
		{
		struct page *page;
		struct inode *inode = io_ctl->inode;
		gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);
		int i;

		@@ -732,7 +732,7 @@ static int __load_free_space_cache(struct btrfs_root root, struct inode inode,

		readahead_cache(inode);

		ret = io_ctl_prepare_pages(&io_ctl, inode, 1);
		ret = io_ctl_prepare_pages(&io_ctl, 1);
		if (ret)
		goto out;

		@@ -1292,7 +1292,7 @@ static int __btrfs_write_out_cache(struct btrfs_root root, struct inode inode,
		}

		/* Lock all pages first so we can lock the extent safely. */
		ret = io_ctl_prepare_pages(io_ctl, inode, 0);
		ret = io_ctl_prepare_pages(io_ctl, 0);
		if (ret)
		goto out_unlock;

Admin message