mirror of https://github.com/OpenIPC/firmware.git
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
diff -drupN a/fs/afs/file.c b/fs/afs/file.c
|
|
--- a/fs/afs/file.c 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/fs/afs/file.c 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -123,11 +123,10 @@ static void afs_file_readpage_read_compl
|
|
/*
|
|
* 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 *fil
|
|
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);
|
|
}
|
|
}
|