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

Commit 6b78cb3c authored by Arnav Sharma's avatar Arnav Sharma
Browse files

Fixing Android Net Test compilation 



Reverting the below commits resolve the compilation error. The below
abandoned commits from upstream were pushed in to the QC kernel
repository which is causing Android Kernel Net Tests to fail.

"ANDROID: mm: fix filler function type mismatch" commit
"ANDROID: fs: fuse: fix filler function type mismatch" commit.

Change-Id: Id6da458fa838d741f4de234d61b6e39116dc186c
Signed-off-by: default avatarArnav Sharma <arnav_s@codeaurora.org>
parent 93cda245

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;