Skip to content

Commit d96d96e

Browse files
dhowellsaxboe
authored andcommitted
afs: Provide a splice-read wrapper
Provide a splice_read wrapper for AFS to call afs_validate() before going into generic_file_splice_read() so that we're likely to have a callback promise from the server. Signed-off-by: David Howells <[email protected]> cc: Christoph Hellwig <[email protected]> cc: Al Viro <[email protected]> cc: Jens Axboe <[email protected]> cc: Marc Dionne <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent c829d0b commit d96d96e

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

fs/afs/file.c

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ static void afs_invalidate_folio(struct folio *folio, size_t offset,
2525
static bool afs_release_folio(struct folio *folio, gfp_t gfp_flags);
2626

2727
static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter);
28+
static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos,
29+
struct pipe_inode_info *pipe,
30+
size_t len, unsigned int flags);
2831
static void afs_vm_open(struct vm_area_struct *area);
2932
static void afs_vm_close(struct vm_area_struct *area);
3033
static vm_fault_t afs_vm_map_pages(struct vm_fault *vmf, pgoff_t start_pgoff, pgoff_t end_pgoff);
@@ -36,7 +39,7 @@ const struct file_operations afs_file_operations = {
3639
.read_iter = afs_file_read_iter,
3740
.write_iter = afs_file_write,
3841
.mmap = afs_file_mmap,
39-
.splice_read = generic_file_splice_read,
42+
.splice_read = afs_file_splice_read,
4043
.splice_write = iter_file_splice_write,
4144
.fsync = afs_fsync,
4245
.lock = afs_lock,
@@ -587,3 +590,18 @@ static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
587590

588591
return generic_file_read_iter(iocb, iter);
589592
}
593+
594+
static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos,
595+
struct pipe_inode_info *pipe,
596+
size_t len, unsigned int flags)
597+
{
598+
struct afs_vnode *vnode = AFS_FS_I(file_inode(in));
599+
struct afs_file *af = in->private_data;
600+
int ret;
601+
602+
ret = afs_validate(vnode, af->key);
603+
if (ret < 0)
604+
return ret;
605+
606+
return generic_file_splice_read(in, ppos, pipe, len, flags);
607+
}

0 commit comments

Comments
 (0)