From: ira.weiny@intel.com
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-nfs@vger.kernel.org, linux-mm@kvack.org,
Ira Weiny <ira.weiny@intel.com>
Subject: [PATCH 1/2] fs: Clean up mapping variable
Date: Mon, 11 Nov 2019 16:34:51 -0800 [thread overview]
Message-ID: <20191112003452.4756-2-ira.weiny@intel.com> (raw)
In-Reply-To: <20191112003452.4756-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The mapping variable is not directly used in these functions. Just
remove the additional variable.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
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;
loff_t pos = 0;
loff_t len = ALIGN_DOWN(i_size_read(inode), PAGE_SIZE);
loff_t ret;
--
2.20.1
next prev parent reply other threads:[~2019-11-12 0:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 0:34 [PATCH 0/2] Move swap functions out of address space operations ira.weiny
2019-11-12 0:34 ` ira.weiny [this message]
2019-11-12 1:20 ` [PATCH 1/2] fs: Clean up mapping variable Darrick J. Wong
2019-11-12 0:34 ` [PATCH 2/2] fs: Move swap_[de]activate to file_operations ira.weiny
2019-11-12 0:43 ` Andrew Morton
2019-11-12 12:00 ` Nikolay Borisov
2019-11-12 13:33 ` Jan Kara
2019-11-12 17:05 ` Weiny, Ira
2019-11-12 1:20 ` Darrick J. Wong
2019-11-12 23:52 ` Ira Weiny
2019-11-12 6:55 ` Christoph Hellwig
2019-11-12 13:30 ` Jan Kara
2019-11-12 17:09 ` Weiny, Ira
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112003452.4756-2-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=akpm@linux-foundation.org \
--cc=anna.schumaker@netapp.com \
--cc=chao@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jaegeuk@kernel.org \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).