The patch titled
Subject: mm: Remove page_file_index
has been added to the -mm tree. Its filename is
mm-remove-page_file_index.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-remove-page_file_index.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-remove-page_file_index.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Huang Ying <ying.huang@xxxxxxxxx>
Subject: 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@xxxxxxxxx
Signed-off-by: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Cc: Anna Schumaker <anna.schumaker@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Cc: Eric Dumazet <edumazet@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/internal.h | 6 +++---
fs/nfs/pagelist.c | 2 +-
fs/nfs/read.c | 2 +-
fs/nfs/write.c | 4 ++--
include/linux/mm.h | 12 ------------
include/linux/pagemap.h | 2 +-
6 files changed, 8 insertions(+), 20 deletions(-)
diff -puN fs/nfs/internal.h~mm-remove-page_file_index fs/nfs/internal.h
--- a/fs/nfs/internal.h~mm-remove-page_file_index
+++ a/fs/nfs/internal.h
@@ -681,11 +681,11 @@ unsigned int nfs_page_length(struct page
loff_t i_size = i_size_read(page_file_mapping(page)->host);
if (i_size > 0) {
- pgoff_t page_index = page_file_index(page);
+ pgoff_t index = page_index(page);
pgoff_t end_index = (i_size - 1) >> PAGE_SHIFT;
- if (page_index < end_index)
+ if (index < end_index)
return PAGE_SIZE;
- if (page_index == end_index)
+ if (index == end_index)
return ((i_size - 1) & ~PAGE_MASK) + 1;
}
return 0;
diff -puN fs/nfs/pagelist.c~mm-remove-page_file_index fs/nfs/pagelist.c
--- a/fs/nfs/pagelist.c~mm-remove-page_file_index
+++ a/fs/nfs/pagelist.c
@@ -342,7 +342,7 @@ nfs_create_request(struct nfs_open_conte
* update_nfs_request below if the region is not locked. */
req->wb_page = page;
if (page) {
- req->wb_index = page_file_index(page);
+ req->wb_index = page_index(page);
get_page(page);
}
req->wb_offset = offset;
diff -puN fs/nfs/read.c~mm-remove-page_file_index fs/nfs/read.c
--- a/fs/nfs/read.c~mm-remove-page_file_index
+++ a/fs/nfs/read.c
@@ -295,7 +295,7 @@ int nfs_readpage(struct file *file, stru
int error;
dprintk("NFS: nfs_readpage (%p %ld@%lu)\n",
- page, PAGE_SIZE, page_file_index(page));
+ page, PAGE_SIZE, page_index(page));
nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);
nfs_add_stats(inode, NFSIOS_READPAGES, 1);
diff -puN fs/nfs/write.c~mm-remove-page_file_index fs/nfs/write.c
--- a/fs/nfs/write.c~mm-remove-page_file_index
+++ a/fs/nfs/write.c
@@ -151,7 +151,7 @@ static void nfs_grow_file(struct page *p
spin_lock(&inode->i_lock);
i_size = i_size_read(inode);
end_index = (i_size - 1) >> PAGE_SHIFT;
- if (i_size > 0 && page_file_index(page) < end_index)
+ if (i_size > 0 && page_index(page) < end_index)
goto out;
end = page_file_offset(page) + ((loff_t)offset+count);
if (i_size >= end)
@@ -603,7 +603,7 @@ static int nfs_do_writepage(struct page
{
int ret;
- nfs_pageio_cond_complete(pgio, page_file_index(page));
+ nfs_pageio_cond_complete(pgio, page_index(page));
ret = nfs_page_async_flush(pgio, page, wbc->sync_mode == WB_SYNC_NONE,
launder);
if (ret == -EAGAIN) {
diff -puN include/linux/mm.h~mm-remove-page_file_index include/linux/mm.h
--- a/include/linux/mm.h~mm-remove-page_file_index
+++ a/include/linux/mm.h
@@ -1061,18 +1061,6 @@ static inline pgoff_t page_index(struct
return page->index;
}
-/*
- * Return the file index of the page. Regular pagecache pages use ->index
- * whereas swapcache pages use swp_offset(->private)
- */
-static inline pgoff_t page_file_index(struct page *page)
-{
- if (unlikely(PageSwapCache(page)))
- return __page_file_index(page);
-
- return page->index;
-}
-
bool page_mapped(struct page *page);
struct address_space *page_mapping(struct page *page);
diff -puN include/linux/pagemap.h~mm-remove-page_file_index include/linux/pagemap.h
--- a/include/linux/pagemap.h~mm-remove-page_file_index
+++ a/include/linux/pagemap.h
@@ -410,7 +410,7 @@ static inline loff_t page_offset(struct
static inline loff_t page_file_offset(struct page *page)
{
- return ((loff_t)page_file_index(page)) << PAGE_SHIFT;
+ return ((loff_t)page_index(page)) << PAGE_SHIFT;
}
extern pgoff_t linear_hugepage_index(struct vm_area_struct *vma,
_
Patches currently in -mm which might be from ying.huang@xxxxxxxxx are
mm-swap-add-swap_cluster_list.patch
mm-dont-use-radix-tree-writeback-tags-for-pages-in-swap-cache.patch
mm-swap-use-offset-of-swap-entry-as-key-of-swap-cache.patch
mm-remove-page_file_index.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
