leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

orangefs: remove orangefs_readpages

Browse Source 
It's a copy of the loop which would run in read_pages from
mm/readahead.c.

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Martin Brandenburg 2018-02-15 18:02:43 +00:00 committed by Mike Marshall
parent afd9fb2a31
commit a68d9c606a
1 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/orangefs/inode.c
View File

@ -15,7 +15,7 @@
#include "orangefs-kernel.h" #include "orangefs-kernel.h"
#include "orangefs-bufmap.h" #include "orangefs-bufmap.h"
static int read_one_page(struct page *page) static int orangefs_readpage(struct file *file, struct page *page)
{ {
int ret; int ret;
int max_block; int max_block;
@ -60,42 +60,6 @@ static int read_one_page(struct page *page)
return ret; return ret;
} }
static int orangefs_readpage(struct file *file, struct page *page)
{
return read_one_page(page);
}
static int orangefs_readpages(struct file *file,
struct address_space *mapping,
struct list_head *pages,
unsigned nr_pages)
{
int page_idx;
int ret;
gossip_debug(GOSSIP_INODE_DEBUG, "orangefs_readpages called\n");
for (page_idx = 0; page_idx < nr_pages; page_idx++) {
struct page *page;
page = lru_to_page(pages);
list_del(&page->lru);
if (!add_to_page_cache(page,
mapping,
page->index,
readahead_gfp_mask(mapping))) {
ret = read_one_page(page);
gossip_debug(GOSSIP_INODE_DEBUG,
"failure adding page to cache, read_one_page returned: %d\n",
ret);
} else {
put_page(page);
}
}
BUG_ON(!list_empty(pages));
return 0;
}
static void orangefs_invalidatepage(struct page *page, static void orangefs_invalidatepage(struct page *page,
unsigned int offset, unsigned int offset,
unsigned int length) unsigned int length)
@ -141,7 +105,6 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb,
/** ORANGEFS2 implementation of address space operations */ /** ORANGEFS2 implementation of address space operations */
static const struct address_space_operations orangefs_address_operations = { static const struct address_space_operations orangefs_address_operations = {
.readpage = orangefs_readpage, .readpage = orangefs_readpage,
.readpages = orangefs_readpages,
.invalidatepage = orangefs_invalidatepage, .invalidatepage = orangefs_invalidatepage,
.releasepage = orangefs_releasepage, .releasepage = orangefs_releasepage,
.direct_IO = orangefs_direct_IO, .direct_IO = orangefs_direct_IO,