From patchwork Tue Aug 6 21:08:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 2839613 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7C424BF535 for ; Tue, 6 Aug 2013 21:08:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A0B6201B4 for ; Tue, 6 Aug 2013 21:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 730FC201B2 for ; Tue, 6 Aug 2013 21:08:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755342Ab3HFVIn (ORCPT ); Tue, 6 Aug 2013 17:08:43 -0400 Received: from mx11.netapp.com ([216.240.18.76]:62958 "EHLO mx11.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754934Ab3HFVIm (ORCPT ); Tue, 6 Aug 2013 17:08:42 -0400 X-IronPort-AV: E=Sophos;i="4.89,827,1367996400"; d="scan'208";a="39631587" Received: from vmwexceht04-prd.hq.netapp.com ([10.106.77.34]) by mx11-out.netapp.com with ESMTP; 06 Aug 2013 14:08:41 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCEHT04-PRD.hq.netapp.com (10.106.77.34) with Microsoft SMTP Server id 14.3.123.3; Tue, 6 Aug 2013 14:08:41 -0700 Received: from vpn2ntap-221827.vpn.netapp.com (vpn2ntap-221827.vpn.netapp.com [10.55.77.206]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id r76L8ZN1022615; Tue, 6 Aug 2013 14:08:40 -0700 (PDT) From: Weston Andros Adamson To: CC: , Weston Andros Adamson Subject: [PATCH 3/5] nfs4.1: Add SP4_MACH_CRED cleanup support Date: Tue, 6 Aug 2013 17:08:29 -0400 Message-ID: <1375823311-18457-4-git-send-email-dros@netapp.com> X-Mailer: git-send-email 1.7.12.4 (Apple Git-37) In-Reply-To: <1375823311-18457-1-git-send-email-dros@netapp.com> References: <1375823311-18457-1-git-send-email-dros@netapp.com> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 CLOSE and LOCKU use the machine cred Signed-off-by: Weston Andros Adamson --- fs/nfs/nfs4proc.c | 28 +++++++++++++++++++++++++++- include/linux/nfs_fs_sb.h | 1 + 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index faa3731..63b6e17 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2511,6 +2511,9 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait) }; int status = -ENOMEM; + nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_CLEANUP, + &task_setup_data.rpc_client, &msg); + calldata = kzalloc(sizeof(*calldata), gfp_mask); if (calldata == NULL) goto out; @@ -5093,6 +5096,9 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl, .flags = RPC_TASK_ASYNC, }; + nfs4_state_protect(NFS_SERVER(lsp->ls_state->inode)->nfs_client, + NFS_SP4_MACH_CRED_CLEANUP, &task_setup_data.rpc_client, &msg); + /* Ensure this is an unlock - when canceling a lock, the * canceled lock is passed in, and it won't be an unlock. */ @@ -5926,6 +5932,15 @@ static const uint32_t _nfs4_spo_must_enforce[NFS4_OP_MAP_NUM_WORDS] = { }; /* + * Operations we'd like to see to enable certain features + */ +static const uint32_t _nfs4_spo_must_allow[NFS4_OP_MAP_NUM_WORDS] = { + [0] = 1 << (OP_CLOSE) | + 1 << (OP_LOCKU) +}; + + +/* * Select the state protection mode for client `clp' given the server results * from exchange_id in `sp'. * @@ -5965,6 +5980,12 @@ static int _nfs4_sp4_select_mode(struct nfs_client *clp, dfprintk(MOUNT, "sp4_mach_cred: disabled\n"); return -EINVAL; } + + if (test_bit(OP_CLOSE, sp->allow.u.longs) && + test_bit(OP_LOCKU, sp->allow.u.longs)) { + dfprintk(MOUNT, " cleanup mode enabled\n"); + set_bit(NFS_SP4_MACH_CRED_CLEANUP, &clp->cl_sp4_flags); + } } return 0; @@ -6031,11 +6052,16 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, case SP4_MACH_CRED: args.state_protect.how = SP4_MACH_CRED; - /* request minumum set of operations */ + /* request enforcement of minumum set of operations */ memcpy(args.state_protect.enforce.u.words, &_nfs4_spo_must_enforce, sizeof(uint32_t) * NFS4_OP_MAP_NUM_WORDS); + /* ask for any other ops we may need for SP4 features */ + memcpy(args.state_protect.allow.u.words, + &_nfs4_spo_must_allow, + sizeof(uint32_t) * NFS4_OP_MAP_NUM_WORDS); + break; default: diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index a0af429..7da24e0 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -91,6 +91,7 @@ struct nfs_client { unsigned long cl_sp4_flags; #define NFS_SP4_MACH_CRED_MINIMAL 1 /* Minimal sp4_mach_cred - state ops * must use machine cred */ +#define NFS_SP4_MACH_CRED_CLEANUP 2 /* CLOSE and LOCKU */ #endif /* CONFIG_NFS_V4 */ #ifdef CONFIG_NFS_FSCACHE