aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-11-19 07:51:18 -0500
committerJ. Bruce Fields <bfields@redhat.com>2014-12-09 11:22:21 -0500
commit779fb0f3af3089daa2e88cf8ef0ef0c5d2fecb40 (patch)
treed16a4b46bc75018d45c4304f1fbf74721d7bb4de /fs/nfsd/vfs.c
parent78b65eb3fda95c6d131c4bbb0536e21f0bd7a7d4 (diff)
sunrpc: move rq_splice_ok flag into rq_flags
Signed-off-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 60c25850fb16..cb00e48bc2b0 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -902,7 +902,7 @@ static __be32
902nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file, 902nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file,
903 loff_t offset, struct kvec *vec, int vlen, unsigned long *count) 903 loff_t offset, struct kvec *vec, int vlen, unsigned long *count)
904{ 904{
905 if (file->f_op->splice_read && rqstp->rq_splice_ok) 905 if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags))
906 return nfsd_splice_read(rqstp, file, offset, count); 906 return nfsd_splice_read(rqstp, file, offset, count);
907 else 907 else
908 return nfsd_readv(file, offset, vec, vlen, count); 908 return nfsd_readv(file, offset, vec, vlen, count);