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.

Nikolay Borisov committed 7 years ago

Commit f86196e1 parent 08d405c10 files · +15 −15Browse files

Unified · Split

10 files

fs/afs/file.c +3 −2
fs/btrfs/extent_io.c +1 −2
fs/ceph/addr.c +2 −3
fs/cifs/file.c +2 −1
fs/ext4/readpage.c +1 −1
fs/ocfs2/aops.c +2 −1
fs/orangefs/inode.c +1 −1
include/linux/mm.h +2 −0
include/linux/mm_inline.h +0 −3
mm/swap.c +1 −1

fs/afs/file.c+3−2

 #include <linux/writeback.h>
 #include <linux/gfp.h>
 #include <linux/task_io_accounting_ops.h>
+#include <linux/mm.h>
 #include "internal.h"
 static int afs_file_mmap(struct file *file, struct vm_area_struct *vma);
 	/* Count the number of contiguous pages at the front of the list.  Note
 	 * 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;
 	n = 1;
 	for (p = first->lru.prev; p != pages; p = p->prev) {
 	 * page at the end of the file.
 	 */
 	do {
-		page = list_entry(pages->prev, struct page, lru);
+		page = lru_to_page(pages);
 		list_del(&page->lru);
 		index = page->index;
 		if (add_to_page_cache_lru(page, mapping, index,

fs/btrfs/extent_io.c+1−2

@@ -4103,8 +4103,7 @@ int extent_readpages(struct address_space mapping, struct list_head pages, · 4102 unmodified lines
4103		4103
4104	while (!list_empty(pages)) {	4104	while (!list_empty(pages)) {
4105	for (nr = 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) {	4105	for (nr = 0; nr < ARRAY_SIZE(pagepool) && !list_empty(pages);) {
4106	struct page *page = list_entry(pages->prev,	4106	struct page *page = lru_to_page(pages);
4107	struct page, lru);
4108		4107
4109	prefetchw(&page->flags);	4108	prefetchw(&page->flags);
4110	list_del(&page->lru);	4109	list_del(&page->lru);

fs/ceph/addr.c+2−3

 	struct ceph_osd_client *osdc =
 		&ceph_inode_to_client(inode)->client->osdc;
 	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_osd_request *req;
 	u64 off;
 			if (got)
 				ceph_put_cap_refs(ci, got);
 			while (!list_empty(page_list)) {
-				page = list_entry(page_list->prev,
+				page = lru_to_page(page_list);
-						  struct page, lru);
 				list_del(&page->lru);
 				put_page(page);
 			}

fs/cifs/file.c+2−1

 #include <linux/mount.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
+#include <linux/mm.h>
 #include <asm/div64.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 	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

fs/ext4/readpage.c+1−1

@@ -128,7 +128,7 @@ int ext4_mpage_readpages(struct address_space *mapping, · 127 unmodified lines
128		128
129	prefetchw(&page->flags);	129	prefetchw(&page->flags);
130	if (pages) {	130	if (pages) {
131	page = list_entry(pages->prev, struct page, lru);	131	page = lru_to_page(pages);
132	list_del(&page->lru);	132	list_del(&page->lru);
133	if (add_to_page_cache_lru(page, mapping, page->index,	133	if (add_to_page_cache_lru(page, mapping, page->index,
134	readahead_gfp_mask(mapping)))	134	readahead_gfp_mask(mapping)))

fs/ocfs2/aops.c+2−1

 #include <linux/quotaops.h>
 #include <linux/blkdev.h>
 #include <linux/uio.h>
+#include <linux/mm.h>
 #include <cluster/masklog.h>
 	 * Check whether a remote node truncated this file - we just
 	 * 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;
 	if (start >= i_size_read(inode))
 		goto out_unlock;

fs/orangefs/inode.c+1−1

@@ -77,7 +77,7 @@ static int orangefs_readpages(struct file *file, · 76 unmodified lines
77	for (page_idx = 0; page_idx < nr_pages; page_idx++) {	77	for (page_idx = 0; page_idx < nr_pages; page_idx++) {
78	struct page *page;	78	struct page *page;
79		79
80	page = list_entry(pages->prev, struct page, lru);	80	page = lru_to_page(pages);
81	list_del(&page->lru);	81	list_del(&page->lru);
82	if (!add_to_page_cache(page,	82	if (!add_to_page_cache(page,
83	mapping,	83	mapping,

include/linux/mm.h+2−0

@@ -171,6 +171,8 @@ extern int overcommit_kbytes_handler(struct ctl_table , int, void __user , · 170 unmodified lines
171	/* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */	171	/* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */
172	#define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE)	172	#define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE)
173		173
		174	#define lru_to_page(head) (list_entry((head)->prev, struct page, lru))
		175
174	/*	176	/*
175	* Linux kernel virtual memory manager primitives.	177	* Linux kernel virtual memory manager primitives.
176	* The idea being to have a "virtual" mm in the same way	178	* The idea being to have a "virtual" mm in the same way

include/linux/mm_inline.h+0−3

@@ -124,7 +124,4 @@ static __always_inline enum lru_list page_lru(struct page *page) · 123 unmodified lines
124	}	124	}
125	return lru;	125	return lru;
126	}	126	}
127
128	#define lru_to_page(head) (list_entry((head)->prev, struct page, lru))
129
130	#endif	127	#endif

mm/swap.c+1−1

@@ -126,7 +126,7 @@ void put_pages_list(struct list_head *pages) · 125 unmodified lines
126	while (!list_empty(pages)) {	126	while (!list_empty(pages)) {
127	struct page *victim;	127	struct page *victim;
128		128
129	victim = list_entry(pages->prev, struct page, lru);	129	victim = lru_to_page(pages);
130	list_del(&victim->lru);	130	list_del(&victim->lru);
131	put_page(victim);	131	put_page(victim);
132	}	132	}