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

Commit 935e2aee authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

ANDROID: fix up 9p filesystem due to CFI non-upstream patches 



I don't know why this suddenly stopped building, but the 9p filesystem
was not properly updated for the CFI patchset.  The change itself
(changing the type of filler_t) seems to not be fully correct, but given
that the patchset is not merged upstream yet, it's hard to determine if
that really is true or not.

This patch fixes the build, which is the main issue here.

Bug: 67506682
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit f162caa29ea874231f6a334a6363f87f9e5b8da1)

Change-Id: I7fcdb37998e187d06e75de5d8cb053757365b970
parent 1391d3b9

fs/9p/vfs_addr.c

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ 
 * @page: structure to page

 *

 */

static int v9fs_fid_readpage(void *data, struct page *page)

static int v9fs_fid_readpage(struct file *data, struct page *page)

{

	struct p9_fid *fid = data;

	struct p9_fid *fid = (struct p9_fid *)data;

	struct inode *inode = page->mapping->host;

	struct bio_vec bvec = {.bv_page = page, .bv_len = PAGE_SIZE};

	struct iov_iter to;
@@ -294,7 +294,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping, 
	if (len == PAGE_SIZE)

		goto out;



	retval = v9fs_fid_readpage(v9inode->writeback_fid, page);

	retval = v9fs_fid_readpage((struct file *)v9inode->writeback_fid, page);

	put_page(page);

	if (!retval)

		goto start;