Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: fs: exofs: fix filler function type

Browse source 
Bug: 67506682
Change-Id: I42f297bfe07a1b7916790415f35ad4f2574ceec7
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Sami Tolvanen 2018-03-02 09:04:53 -08:00 committed by Amit Pundir
parent 099e24bfa7
commit 03df7fb8f3
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/exofs/inode.c
View file

@ -377,9 +377,8 @@ static int read_exec(struct page_collect *pcol)
* and will start a new collection. Eventually caller must submit the last * and will start a new collection. Eventually caller must submit the last
* segment if present. * segment if present.
*/ */
static int readpage_strip(void *data, struct page *page) static int __readpage_strip(struct page_collect *pcol, struct page *page)
{ {
struct page_collect *pcol = data;
struct inode *inode = pcol->inode; struct inode *inode = pcol->inode;
struct exofs_i_info *oi = exofs_i(inode); struct exofs_i_info *oi = exofs_i(inode);
loff_t i_size = i_size_read(inode); loff_t i_size = i_size_read(inode);
@ -470,6 +469,13 @@ static int readpage_strip(void *data, struct page *page)
return ret; return ret;
} }
static int readpage_strip(struct file *data, struct page *page)
{
struct page_collect *pcol = (struct page_collect *)data;
return __readpage_strip(pcol, page);
}
static int exofs_readpages(struct file *file, struct address_space *mapping, static int exofs_readpages(struct file *file, struct address_space *mapping,
struct list_head *pages, unsigned nr_pages) struct list_head *pages, unsigned nr_pages)
{ {
@ -499,7 +505,7 @@ static int _readpage(struct page *page, bool read_4_write)
_pcol_init(&pcol, 1, page->mapping->host); _pcol_init(&pcol, 1, page->mapping->host);
pcol.read_4_write = read_4_write; pcol.read_4_write = read_4_write;
ret = readpage_strip(&pcol, page); ret = __readpage_strip(&pcol, page);
if (ret) { if (ret) {
EXOFS_ERR("_readpage => %d\n", ret); EXOFS_ERR("_readpage => %d\n", ret);
return ret; return ret;