Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cd79788 authored by Huang Ying's avatar Huang Ying Committed by Linus Torvalds
Browse files

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: default avatar"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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f6ab1f7f

fs/nfs/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

fs/nfs/pagelist.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/nfs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

include/linux/mm.h

+0 −12
Original line number Diff line number Diff line
@@ -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);