Commit e0cc12e0 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Stephen Rothwell

fs: don't open code lru_to_page()

Multiple filesystems open code lru_to_page().  Rectify this by moving the
macro from mm_inline (which is specific to lru stuff) to the more generic
mm.h header and start using the macro where appropriate.

No functional changes.

Link: http://lkml.kernel.org/r/20181129104810.23361-1-nborisov@suse.com
Link: https://lkml.kernel.org/r/20181129075301.29087-1-nborisov@suse.comSigned-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarPankaj gupta <pagupta@redhat.com>
Acked-by: "Yan, Zheng" <zyan@redhat.com>		[ceph]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent b33045b4
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/task_io_accounting_ops.h> #include <linux/task_io_accounting_ops.h>
#include <linux/mm.h>
#include "internal.h" #include "internal.h"
static int afs_file_mmap(struct file *file, struct vm_area_struct *vma); static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);
...@@ -441,7 +442,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, ...@@ -441,7 +442,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping,
/* Count the number of contiguous pages at the front of the list. Note /* Count the number of contiguous pages at the front of the list. Note
* that the list goes prev-wards rather than next-wards. * that the list goes prev-wards rather than next-wards.
*/ */
first = list_entry(pages->prev, struct page, lru); first = lru_to_page(pages);
index = first->index + 1; index = first->index + 1;
n = 1; n = 1;
for (p = first->lru.prev; p != pages; p = p->prev) { for (p = first->lru.prev; p != pages; p = p->prev) {
...@@ -473,7 +474,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, ...@@ -473,7 +474,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping,
* page at the end of the file. * page at the end of the file.
*/ */
do { do {
page = list_entry(pages->prev, struct page, lru); page = lru_to_page(pages);
list_del(&page->lru); list_del(&page->lru);
index = page->index; index = page->index;
if (add_to_page_cache_lru(page, mapping, index, if (add_to_page_cache_lru(page, mapping, index,
......
...@@ -4103,8 +4103,7 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages, ...@@ -4103,8 +4103,7 @@ int extent_readpages(struct address_space *mapping, struct list_head *pages,
while (!list_empty(pages)) { while (!list_empty(pages)) {
for (nr = 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) { for (nr = 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) {
struct page *page = list_entry(pages->prev, struct page *page = lru_to_page(pages);
struct page, lru);
prefetchw(&page->flags); prefetchw(&page->flags);
list_del(&page->lru); list_del(&page->lru);
......
...@@ -306,7 +306,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, ...@@ -306,7 +306,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx,
struct ceph_osd_client *osdc = struct ceph_osd_client *osdc =
&ceph_inode_to_client(inode)->client->osdc; &ceph_inode_to_client(inode)->client->osdc;
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
struct page *page = list_entry(page_list->prev, struct page, lru); struct page *page = lru_to_page(page_list);
struct ceph_vino vino; struct ceph_vino vino;
struct ceph_osd_request *req; struct ceph_osd_request *req;
u64 off; u64 off;
...@@ -333,8 +333,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, ...@@ -333,8 +333,7 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx,
if (got) if (got)
ceph_put_cap_refs(ci, got); ceph_put_cap_refs(ci, got);
while (!list_empty(page_list)) { while (!list_empty(page_list)) {
page = list_entry(page_list->prev, page = lru_to_page(page_list);
struct page, lru);
list_del(&page->lru); list_del(&page->lru);
put_page(page); put_page(page);
} }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/mm.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "cifsfs.h" #include "cifsfs.h"
#include "cifspdu.h" #include "cifspdu.h"
...@@ -3964,7 +3965,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list, ...@@ -3964,7 +3965,7 @@ readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
INIT_LIST_HEAD(tmplist); INIT_LIST_HEAD(tmplist);
page = list_entry(page_list->prev, struct page, lru); page = lru_to_page(page_list);
/* /*
* Lock the page and put it in the cache. Since no one else * Lock the page and put it in the cache. Since no one else
......
...@@ -252,7 +252,7 @@ int ext4_mpage_readpages(struct address_space *mapping, ...@@ -252,7 +252,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
prefetchw(&page->flags); prefetchw(&page->flags);
if (pages) { if (pages) {
page = list_entry(pages->prev, struct page, lru); page = lru_to_page(pages);
list_del(&page->lru); list_del(&page->lru);
if (add_to_page_cache_lru(page, mapping, page->index, if (add_to_page_cache_lru(page, mapping, page->index,
readahead_gfp_mask(mapping))) readahead_gfp_mask(mapping)))
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/mm.h>
#include <cluster/masklog.h> #include <cluster/masklog.h>
...@@ -397,7 +398,7 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping, ...@@ -397,7 +398,7 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping,
* Check whether a remote node truncated this file - we just * Check whether a remote node truncated this file - we just
* drop out in that case as it's not worth handling here. * drop out in that case as it's not worth handling here.
*/ */
last = list_entry(pages->prev, struct page, lru); last = lru_to_page(pages);
start = (loff_t)last->index << PAGE_SHIFT; start = (loff_t)last->index << PAGE_SHIFT;
if (start >= i_size_read(inode)) if (start >= i_size_read(inode))
goto out_unlock; goto out_unlock;
......
...@@ -77,7 +77,7 @@ static int orangefs_readpages(struct file *file, ...@@ -77,7 +77,7 @@ static int orangefs_readpages(struct file *file,
for (page_idx = 0; page_idx < nr_pages; page_idx++) { for (page_idx = 0; page_idx < nr_pages; page_idx++) {
struct page *page; struct page *page;
page = list_entry(pages->prev, struct page, lru); page = lru_to_page(pages);
list_del(&page->lru); list_del(&page->lru);
if (!add_to_page_cache(page, if (!add_to_page_cache(page,
mapping, mapping,
......
...@@ -206,6 +206,8 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *, ...@@ -206,6 +206,8 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *,
/* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */
#define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE)
#define lru_to_page(head) (list_entry((head)->prev, struct page, lru))
/* /*
* Linux kernel virtual memory manager primitives. * Linux kernel virtual memory manager primitives.
* The idea being to have a "virtual" mm in the same way * The idea being to have a "virtual" mm in the same way
......
...@@ -124,7 +124,4 @@ static __always_inline enum lru_list page_lru(struct page *page) ...@@ -124,7 +124,4 @@ static __always_inline enum lru_list page_lru(struct page *page)
} }
return lru; return lru;
} }
#define lru_to_page(head) (list_entry((head)->prev, struct page, lru))
#endif #endif
...@@ -126,7 +126,7 @@ void put_pages_list(struct list_head *pages) ...@@ -126,7 +126,7 @@ void put_pages_list(struct list_head *pages)
while (!list_empty(pages)) { while (!list_empty(pages)) {
struct page *victim; struct page *victim;
victim = list_entry(pages->prev, struct page, lru); victim = lru_to_page(pages);
list_del(&victim->lru); list_del(&victim->lru);
put_page(victim); put_page(victim);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment