diff options
author | Huang Ying <ying.huang@intel.com> | 2016-10-07 20:00:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 21:46:28 -0400 |
commit | 8cd797887ae0a73313ba248e027e59c0a597d693 (patch) | |
tree | ef50ba51023913699ea9a7c694a5e051d534affd /fs/nfs/write.c | |
parent | f6ab1f7f6b2d8e48c5fc47746a67363b20d79a1d (diff) |
mm: remove page_file_index
After using the offset of the swap entry as the key of the swap cache,
the page_index() becomes exactly same as page_file_index(). So the
page_file_index() is removed and the callers are changed to use
page_index() instead.
Link: http://lkml.kernel.org/r/1473270649-27229-2-git-send-email-ying.huang@intel.com
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r-- | fs/nfs/write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 3a6724c6eb5f..53211838f72a 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -151,7 +151,7 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c | |||
151 | spin_lock(&inode->i_lock); | 151 | spin_lock(&inode->i_lock); |
152 | i_size = i_size_read(inode); | 152 | i_size = i_size_read(inode); |
153 | end_index = (i_size - 1) >> PAGE_SHIFT; | 153 | end_index = (i_size - 1) >> PAGE_SHIFT; |
154 | if (i_size > 0 && page_file_index(page) < end_index) | 154 | if (i_size > 0 && page_index(page) < end_index) |
155 | goto out; | 155 | goto out; |
156 | end = page_file_offset(page) + ((loff_t)offset+count); | 156 | end = page_file_offset(page) + ((loff_t)offset+count); |
157 | if (i_size >= end) | 157 | if (i_size >= end) |
@@ -603,7 +603,7 @@ static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, | |||
603 | { | 603 | { |
604 | int ret; | 604 | int ret; |
605 | 605 | ||
606 | nfs_pageio_cond_complete(pgio, page_file_index(page)); | 606 | nfs_pageio_cond_complete(pgio, page_index(page)); |
607 | ret = nfs_page_async_flush(pgio, page, wbc->sync_mode == WB_SYNC_NONE, | 607 | ret = nfs_page_async_flush(pgio, page, wbc->sync_mode == WB_SYNC_NONE, |
608 | launder); | 608 | launder); |
609 | if (ret == -EAGAIN) { | 609 | if (ret == -EAGAIN) { |