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/[email protected]
Signed-off-by: "Huang, Ying" <[email protected]>
Cc: Trond Myklebust <[email protected]>
Cc: Anna Schumaker <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Cc: Ross Zwisler <[email protected]>
Cc: Eric Dumazet <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 74935a19e4bfc678767dcc7fde3fcef16d7872e2..da9e5584bfdc62b96378cc97bfc393402e13d53a 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -681,11 +681,11 @@ unsigned int nfs_page_length(struct page *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 --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 174dd4cf5747f50afaa4d7217fdee16a1e6de11a..965db474f4b0d11d7a59fe839703c7505d714ce9 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -342,7 +342,7 @@ nfs_create_request(struct nfs_open_context *ctx, struct page *page,
         * 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 --git a/fs/nfs/read.c b/fs/nfs/read.c
index 572e5b3b06f1566f40e7df7be33b8f14aafd2e16..defc9233e9858c43a9438b2cf918a899b7f56afa 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -295,7 +295,7 @@ int nfs_readpage(struct file *file, struct page *page)
        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 --git a/fs/nfs/write.c b/fs/nfs/write.c
index 3a6724c6eb5ffbd6e83e45354cb2d4d068577527..53211838f72aac44c416b13ac926f3533d7e2553 100644 (file)
--- 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
        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 *page, struct writeback_control *wbc,
 {
        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 --git a/include/linux/mm.h b/include/linux/mm.h
index 028e84e2ab42832bda5b6698518c753a428bf2ca..3e8807e0b9d2f9457a38c7be3f5f647e543eaf4a 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1061,18 +1061,6 @@ static inline pgoff_t page_index(struct page *page)
        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 --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 48d9cf04337c783e9f2c85915e496603f6a5e0d0..794dbcb91084e0467c857465974de1409d9f7b73 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -408,7 +408,7 @@ static inline loff_t page_offset(struct page *page)
 
 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,