diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-11-19 13:51:18 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 17:22:21 +0100 |
| commit | 779fb0f3af3089daa2e88cf8ef0ef0c5d2fecb40 (patch) | |
| tree | d16a4b46bc75018d45c4304f1fbf74721d7bb4de /fs/nfsd/vfs.c | |
| parent | sunrpc: move rq_dropme flag into rq_flags (diff) | |
| download | linux-779fb0f3af3089daa2e88cf8ef0ef0c5d2fecb40.tar.xz linux-779fb0f3af3089daa2e88cf8ef0ef0c5d2fecb40.zip | |
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.c | 2 |
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 nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file, loff_t offset, struct kvec *vec, int vlen, unsigned long *count) { - if (file->f_op->splice_read && rqstp->rq_splice_ok) + if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags)) return nfsd_splice_read(rqstp, file, offset, count); else return nfsd_readv(file, offset, vec, vlen, count); |