[PATCH v5 6/7] fs/nfsd: support compiling out splice
flat view
DORMANTno replies
SUPERSEDED
From: Pieter Smith <hidden>
Date: 2014-11-25 07:19:41
Also in:
linux-fsdevel, linux-nfs, lkml, netdev
Subsystem:
kernel nfsd, sunrpc, and lockd servers, networking [general], nfs, sunrpc, and lockd clients, the rest · Maintainers:
Chuck Lever, Jeff Layton, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Trond Myklebust, Anna Schumaker, Linus Torvalds
Revision v5 of 2 in this series.
Revisions (2)
- v5 current
- v6 [diff vs current]
The goal of the larger patch set is to completely compile out fs/splice, and as a result, splice support for all file-systems. This patch ensures that fs/nfsd falls back to non-splice fs support when CONFIG_SYSCALL_SPLICE is undefined. Signed-off-by: Pieter Smith <redacted> --- net/sunrpc/svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index ca8a795..6cacc37 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c@@ -1084,7 +1084,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) goto err_short_len; /* Will be turned off only in gss privacy case: */ - rqstp->rq_splice_ok = true; + rqstp->rq_splice_ok = IS_ENABLED(CONFIG_SPLICE_SYSCALL); /* Will be turned off only when NFSv4 Sessions are used */ rqstp->rq_usedeferral = true; rqstp->rq_dropme = false;
--
2.1.0