diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2018-03-02 09:02:16 -0800 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2022-10-28 15:57:24 +0100 |
| commit | 7a45ac4bfb49bd97a044e5b5217af7ba88246b34 (patch) | |
| tree | 1cb07645545248ed91754a7214420c518580284a /fs/afs | |
| parent | 4099e1b281e513ad0dabd155e3e6d31cd0b84573 (diff) | |
BACKPORT: ANDROID: fs: afs: fix filler function type
Bug: 67506682
Change-Id: I76d208c8606ee5af144891d14bd309912d4d788d
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
(cherry picked from commit 53f4adf6788d71d322f810efb271a5658f44d193)
Signed-off-by: Dan Aloni <daloni@magicleap.com>
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/file.c | 14 | ||||
| -rw-r--r-- | fs/afs/internal.h | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/fs/afs/file.c b/fs/afs/file.c index cf8a07e282a6..5290f6e83605 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -123,11 +123,10 @@ static void afs_file_readpage_read_complete(struct page *page, /* * read page from file, directory or symlink, given a key to use */ -int afs_page_filler(void *data, struct page *page) +static int __afs_page_filler(struct key *key, struct page *page) { struct inode *inode = page->mapping->host; struct afs_vnode *vnode = AFS_FS_I(inode); - struct key *key = data; size_t len; off_t offset; int ret; @@ -209,6 +208,13 @@ error: return ret; } +int afs_page_filler(struct file *data, struct page *page) +{ + struct key *key = (struct key *)data; + + return __afs_page_filler(key, page); +} + /* * read page from file, directory or symlink, given a file to nominate the key * to be used @@ -221,14 +227,14 @@ static int afs_readpage(struct file *file, struct page *page) if (file) { key = file->private_data; ASSERT(key != NULL); - ret = afs_page_filler(key, page); + ret = __afs_page_filler(key, page); } else { struct inode *inode = page->mapping->host; key = afs_request_key(AFS_FS_S(inode->i_sb)->volume->cell); if (IS_ERR(key)) { ret = PTR_ERR(key); } else { - ret = afs_page_filler(key, page); + ret = __afs_page_filler(key, page); key_put(key); } } diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 1330b2a695ff..64452ba25988 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -499,7 +499,7 @@ extern const struct file_operations afs_file_operations; extern int afs_open(struct inode *, struct file *); extern int afs_release(struct inode *, struct file *); -extern int afs_page_filler(void *, struct page *); +extern int afs_page_filler(struct file *, struct page *); /* * flock.c |