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

Commit 2e38812e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fixing Android Net Test compilation"

parents ab4e3cec 6b78cb3c

fs/fuse/file.c

+2 −2
Original line number Diff line number Diff line
@@ -845,9 +845,9 @@ struct fuse_fill_data { 
	unsigned nr_pages;

};



static int fuse_readpages_fill(struct file *_data, struct page *page)

static int fuse_readpages_fill(void *_data, struct page *page)

{

	struct fuse_fill_data *data = (struct fuse_fill_data *)_data;

	struct fuse_fill_data *data = _data;

	struct fuse_req *req = data->req;

	struct inode *inode = data->inode;

	struct fuse_conn *fc = get_fuse_conn(inode);

include/linux/pagemap.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static inline gfp_t readahead_gfp_mask(struct address_space *x) 
	return mapping_gfp_mask(x) | __GFP_NORETRY | __GFP_NOWARN;

}



typedef int filler_t(struct file *, struct page *);

typedef int filler_t(void *, struct page *);



pgoff_t page_cache_next_hole(struct address_space *mapping,

			     pgoff_t index, unsigned long max_scan);

mm/filemap.c

+2 −2
Original line number Diff line number Diff line
@@ -2888,7 +2888,7 @@ static struct page *wait_on_page_read(struct page *page) 


static struct page *do_read_cache_page(struct address_space *mapping,

				pgoff_t index,

				int (*filler)(struct file *, struct page *),

				int (*filler)(void *, struct page *),

				void *data,

				gfp_t gfp)

{
@@ -2999,7 +2999,7 @@ static struct page *do_read_cache_page(struct address_space *mapping, 
 */

struct page *read_cache_page(struct address_space *mapping,

				pgoff_t index,

				int (*filler)(struct file *, struct page *),

				int (*filler)(void *, struct page *),

				void *data)

{

	return do_read_cache_page(mapping, index, filler, data, mapping_gfp_mask(mapping));

mm/readahead.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void read_cache_pages_invalidate_pages(struct address_space *mapping, 
 * Hides the details of the LRU cache etc from the filesystems.

 */

int read_cache_pages(struct address_space *mapping, struct list_head *pages,

			int (*filler)(struct file *, struct page *), void *data)

			int (*filler)(void *, struct page *), void *data)

{

	struct page *page;

	int ret = 0;