From patchwork Fri Aug 9 16:49:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 2842035 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 4C68F9F271 for ; Fri, 9 Aug 2013 16:49:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BC8720441 for ; Fri, 9 Aug 2013 16:49:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 419C220431 for ; Fri, 9 Aug 2013 16:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968195Ab3HIQtc (ORCPT ); Fri, 9 Aug 2013 12:49:32 -0400 Received: from mail-gh0-f179.google.com ([209.85.160.179]:59847 "EHLO mail-gh0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968171Ab3HIQtc (ORCPT ); Fri, 9 Aug 2013 12:49:32 -0400 Received: by mail-gh0-f179.google.com with SMTP id f16so1291746ghb.38 for ; Fri, 09 Aug 2013 09:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:from:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=zedcmBRsaYsCgNm/SNqd6SRchpr5+iTWTASgGdJuCcI=; b=fkjvGIS7XwykWenRbfycl5PHC/YWeBJpwT3op/Zyv53vHkGYntLpQQZ8YO41vkf8HN YST5A6fIWcQ6CKch2iOrIsrMQ2q50EXuCp515gFNn2L99OcXlmVMd0pRIcrCo54x0Gt0 4vY/bj3MapuifgrDC5srikQfvYpO1KD3u4WHCLh7vqpQFFPSuvxZZ3084o3R+kc9dT7P jgx6tWXyNwOaopPlG86bPi/Z7pN3ohGxGBKzbXU7yk2UiHxJmz+ArivUc5BgbK8WEcmS StQAz+D9BzJ/HW6ZtpbHgu2U7YIezkXHRM836ALfju00J8M36JSqjZIHsEbQJvsCaBN/ YRlA== X-Received: by 10.236.223.72 with SMTP id u68mr5724596yhp.161.1376066971285; Fri, 09 Aug 2013 09:49:31 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by mx.google.com with ESMTPSA id s65sm20680045yhs.14.2013.08.09.09.49.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 Aug 2013 09:49:30 -0700 (PDT) Subject: [PATCH v2 12/33] NFS: Enable nfs4_setup_sequence() for DELEGRETURN To: linux-nfs@vger.kernel.org From: Chuck Lever Date: Fri, 09 Aug 2013 12:49:29 -0400 Message-ID: <20130809164929.5362.2502.stgit@seurat.1015granger.net> In-Reply-To: <20130809161957.5362.90865.stgit@seurat.1015granger.net> References: <20130809161957.5362.90865.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 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,RP_MATCHES_RCVD,T_DKIM_INVALID,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 When CONFIG_NFS_V4_1 is disabled, the calls to nfs4_setup_sequence() and nfs4_sequence_done() are compiled out for the DELEGRETURN operation. To allow NFSv4.0 transport blocking to work for DELEGRETURN, these call sites have to be present all the time. Signed-off-by: Chuck Lever --- fs/nfs/nfs4proc.c | 4 ---- 1 file changed, 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 51f4272..b915c7d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4862,7 +4862,6 @@ static void nfs4_delegreturn_release(void *calldata) kfree(calldata); } -#if defined(CONFIG_NFS_V4_1) static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) { struct nfs4_delegreturndata *d_data; @@ -4874,12 +4873,9 @@ static void nfs4_delegreturn_prepare(struct rpc_task *task, void *data) &d_data->res.seq_res, task); } -#endif /* CONFIG_NFS_V4_1 */ static const struct rpc_call_ops nfs4_delegreturn_ops = { -#if defined(CONFIG_NFS_V4_1) .rpc_call_prepare = nfs4_delegreturn_prepare, -#endif /* CONFIG_NFS_V4_1 */ .rpc_call_done = nfs4_delegreturn_done, .rpc_release = nfs4_delegreturn_release, };