From patchwork Thu Dec 4 17:50:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Smith X-Patchwork-Id: 5439551 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C12859F507 for ; Thu, 4 Dec 2014 17:53:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E499820272 for ; Thu, 4 Dec 2014 17:53:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EB0A2021A for ; Thu, 4 Dec 2014 17:52:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933071AbaLDRw3 (ORCPT ); Thu, 4 Dec 2014 12:52:29 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:53534 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932916AbaLDRwX (ORCPT ); Thu, 4 Dec 2014 12:52:23 -0500 Received: by mail-wg0-f50.google.com with SMTP id k14so23111277wgh.23 for ; Thu, 04 Dec 2014 09:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zNu4WrLFOHmLls+0zg9G0rv1sUp0QuQVhWWtgd59Qlo=; b=zekFJise/98ZY0mePLVXtgSLtI4oN0yWrbmEx0o76ixH4gWBEvS7SFStHNi5QOUjCq TnRKSvb8Ewr4sIyaITOrdHM0fuei6JoAEj3QZBA5kiTyJRyP7b/1Lxq5BoIXS67I/3m/ 06CS5UTtRHUgmcUWcSEZyiIWoi/K7rtLuwkYIEnXblZC+iDFnMHCWO5nGrRwbXOCQRUP 4XI2AVV5lYZSZyYWAL0M4i36tN5GPjxiBnK08HQnfUNlr1Wt9dLHbPoydBznIVn4EGYM PGGg/GVPWTiDQoINnFUuEg859nNZM6jDBbZAkCB6imln91kEvhx2EntE3er/PkXTaZka MIRQ== X-Received: by 10.180.76.7 with SMTP id g7mr23806548wiw.38.1417715541801; Thu, 04 Dec 2014 09:52:21 -0800 (PST) Received: from localhost.localdomain (ip4da2e5c1.direct-adsl.nl. [77.162.229.193]) by mx.google.com with ESMTPSA id et4sm6578978wjd.15.2014.12.04.09.52.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Dec 2014 09:52:21 -0800 (PST) From: Pieter Smith To: linux-kernel@vger.kernel.org Cc: Josh Triplett , Pieter Smith , Alexander Duyck , Alexander Viro , Alexei Starovoitov , Andrew Morton , Bertrand Jacquin , Catalina Mocanu , Daniel Borkmann , "David S. Miller" , Eric Dumazet , "Eric W. Biederman" , Fabian Frederick , fuse-devel@lists.sourceforge.net (open list:FUSE: FILESYSTEM...), Geert Uytterhoeven , Hugh Dickins , Iulia Manda , Jan Beulich , "J. Bruce Fields" , Jeff Layton , linux-api@vger.kernel.org (open list:ABI/API), linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org (open list:KERNEL NFSD, SUNR...), "Luis R. Rodriguez" , Matt Turner , Mel Gorman , "Michael S. Tsirkin" , Miklos Szeredi , netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), Oleg Nesterov , Paul Durrant , "Paul E. McKenney" , Peter Foley , Thomas Graf , Tom Herbert , Trond Myklebust , Willem de Bruijn , Xiao Guangrong , =?UTF-8?q?=E8=94=A1=E6=AD=A3=E9=BE=99?= Subject: [PATCH v6 6/7] fs/nfsd: support compiling out splice Date: Thu, 4 Dec 2014 18:50:54 +0100 Message-Id: <1417715473-24110-7-git-send-email-pieter@boesman.nl> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417715473-24110-1-git-send-email-pieter@boesman.nl> References: <1417715473-24110-1-git-send-email-pieter@boesman.nl> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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;