On Mon, Nov 11, 2019 at 04:34:51PM -0800, ira.weiny@xxxxxxxxx wrote:
> From: Ira Weiny <ira.weiny@xxxxxxxxx>
>
> The mapping variable is not directly used in these functions. Just
> remove the additional variable.
>
> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
> ---
> fs/f2fs/data.c | 3 +--
> fs/iomap/swapfile.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index ba3bcf4c7889..3c7777bfae17 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3146,8 +3146,7 @@ int f2fs_migrate_page(struct address_space *mapping,
> /* Copied from generic_swapfile_activate() to check any holes */
> static int check_swap_activate(struct file *swap_file, unsigned int max)
> {
> - struct address_space *mapping = swap_file->f_mapping;
> - struct inode *inode = mapping->host;
> + struct inode *inode = swap_file->f_mapping->host;
> unsigned blocks_per_page;
> unsigned long page_no;
> unsigned blkbits;
> diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c
> index a648dbf6991e..80571add0180 100644
> --- a/fs/iomap/swapfile.c
> +++ b/fs/iomap/swapfile.c
> @@ -140,8 +140,7 @@ int iomap_swapfile_activate(struct swap_info_struct *sis,
> .sis = sis,
> .lowest_ppage = (sector_t)-1ULL,
> };
> - struct address_space *mapping = swap_file->f_mapping;
> - struct inode *inode = mapping->host;
> + struct inode *inode = swap_file->f_mapping->host;
For the iomap part,
Acked-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> loff_t pos = 0;
> loff_t len = ALIGN_DOWN(i_size_read(inode), PAGE_SIZE);
> loff_t ret;
> --
> 2.20.1
>
