diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-07-31 09:09:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-08-04 11:44:10 +0200 |
| commit | aa431c38ed0ac67c9ccca0bb8265f7fb36fe3345 (patch) | |
| tree | 2f4aa2e6ac5239b780317b63c92a745d38f3ddad | |
| parent | 0eb90dd8f717485777dc4aa47be2d7b9786619bf (diff) | |
ANDROID: fix up 9p filesystem due to CFI non-upstream patchesASB-2019-08-05_4.9-q
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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7fcdb37998e187d06e75de5d8cb053757365b970
| -rw-r--r-- | fs/9p/vfs_addr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index e45b1a0dd513..d618c20f272c 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -49,9 +49,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; @@ -293,7 +293,7 @@ start: 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; |