From patchwork Fri May 4 20:22:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 10381641 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F1B6F6038F for ; Fri, 4 May 2018 20:23:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFCEE29404 for ; Fri, 4 May 2018 20:23:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D49B329438; Fri, 4 May 2018 20:23:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C431294EA for ; Fri, 4 May 2018 20:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751687AbeEDUXB (ORCPT ); Fri, 4 May 2018 16:23:01 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:34050 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751706AbeEDUXA (ORCPT ); Fri, 4 May 2018 16:23:00 -0400 Received: by mail-qk0-f193.google.com with SMTP id p186so17625067qkd.1 for ; Fri, 04 May 2018 13:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=f2l4iXB3qGzk+ZRMzO7TwHLpZIjY5+JZl1GRGu2z3Ew=; b=rProJTGs9sfDQIKEEnoyR0tHgMSdVv0vPpKp0U1jhajjutxm5k/oEKcT73odxfpHvv j5v2DvDiT22BqWVGZxcfu6WY4i3WjGcbNCO1bIEb+LlqtuzP9YYcvxBCJ6kr0VwiRuZD Y6jUC4bJwopQhdfuBOAQC8m+9RyFl1c9NRRsDQkIDdbQ8+7C9ntdD+ak1hSxzPLRvWPi j4bPrR9jwmV/6bKWHVWpnUYzfTbXIxyrSvrY/kMhgE+7ms9HBL1lsbr1uQtnql/tYHrE StovxbJU4LGMnP9Jme1ng4u/EN4SEELK34hMfS1053rVeFah6BkGBjg6ggxTnBjYdfaD bmIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=f2l4iXB3qGzk+ZRMzO7TwHLpZIjY5+JZl1GRGu2z3Ew=; b=fcAZgJHIFuj0soVOryCYS2v3YUMcUHCxhju+UZyt0hFUM1huki8vXOrbHfj2rHKFBD +WB13mbUXul14TmR0ZEjVsgO2AjOe+o45RPZNur8iNzFs3fDs3oJ9H3T0YqR9z0afDTZ a780TNS8QWY+p+yNeiLNJBEphdsbx3UMVZ/EKx63BHtxD3tBjUeFp53SfxRhMLuxhPkk O17vW5UvcFhLH3oUcFfzEZ9jNjAb9Lc8cQ3ciXYkm37z2oI+GDxpuo2iEtEUdcRJpmph 0PoJiNrg/oW3hlohohzk3e8/SGw64655uJ/PdShkXFR+dUv7klD92FzE8QACJpcvhkwX 6Xlg== X-Gm-Message-State: ALQs6tCZMJxwla7qIXPMwy5w9CUqBnIlHTkQSjoap6dwPuTE9+Er4DYR WVpV26m0UoCPfdYo3+jhtM/XP32h X-Google-Smtp-Source: AB8JxZr8AdhrasOgzzlr3PN2ZmYfhmMxSDxdq/CdVWA7jNHX/aS3MLHtG121FFpnL5XzEeHarPPU6g== X-Received: by 10.55.137.67 with SMTP id l64mr14390361qkd.195.1525465379234; Fri, 04 May 2018 13:22:59 -0700 (PDT) Received: from gouda.nowheycreamery.com.com (c-68-40-188-1.hsd1.mi.comcast.net. [68.40.188.1]) by smtp.gmail.com with ESMTPSA id m25-v6sm7359261qtb.42.2018.05.04.13.22.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 13:22:58 -0700 (PDT) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: Trond.Myklebust@primarydata.com, linux-nfs@vger.kernel.org Subject: [PATCH 2/5] NFS: Move call to nfs4_state_protect() to nfs4_commit_setup() Date: Fri, 4 May 2018 16:22:49 -0400 Message-Id: <20180504202252.5862-3-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504202252.5862-1-Anna.Schumaker@Netapp.com> References: <20180504202252.5862-1-Anna.Schumaker@Netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anna Schumaker Rather than doing this in the generic NFS client code. Let's put this with the other v4 stuff so it's all in one place. Signed-off-by: Anna Schumaker --- fs/nfs/nfs3proc.c | 3 ++- fs/nfs/nfs4proc.c | 4 +++- fs/nfs/proc.c | 3 ++- fs/nfs/write.c | 5 +---- include/linux/nfs_xdr.h | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 3ffaff471592..6ed6a4195906 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -845,7 +845,8 @@ static int nfs3_commit_done(struct rpc_task *task, struct nfs_commit_data *data) return 0; } -static void nfs3_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg) +static void nfs3_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg, + struct rpc_clnt **clnt) { msg->rpc_proc = &nfs3_procedures[NFS3PROC_COMMIT]; } diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 09be575e9194..50a067018a60 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5028,7 +5028,8 @@ static int nfs4_commit_done(struct rpc_task *task, struct nfs_commit_data *data) return data->commit_done_cb(task, data); } -static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg) +static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg, + struct rpc_clnt **clnt) { struct nfs_server *server = NFS_SERVER(data->inode); @@ -5037,6 +5038,7 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess data->res.server = server; msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT]; nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1); + nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_COMMIT, clnt, msg); } struct nfs4_renewdata { diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index aaad337962d0..80c350b6232a 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -632,7 +632,8 @@ static void nfs_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit } static void -nfs_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg) +nfs_proc_commit_setup(struct nfs_commit_data *data, struct rpc_message *msg, + struct rpc_clnt **clnt) { BUG(); } diff --git a/fs/nfs/write.c b/fs/nfs/write.c index b633583ca268..a057b4f45a46 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1666,14 +1666,11 @@ int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data, .priority = priority, }; /* Set up the initial task struct. */ - nfs_ops->commit_setup(data, &msg); + nfs_ops->commit_setup(data, &msg, &task_setup_data.rpc_client); trace_nfs_initiate_commit(data); dprintk("NFS: initiated commit call\n"); - nfs4_state_protect(NFS_SERVER(data->inode)->nfs_client, - NFS_SP4_MACH_CRED_COMMIT, &task_setup_data.rpc_client, &msg); - task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 1009269e1a49..52b481dfd61e 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1623,7 +1623,8 @@ struct nfs_rpc_ops { void (*write_setup)(struct nfs_pgio_header *, struct rpc_message *, struct rpc_clnt **); int (*write_done)(struct rpc_task *, struct nfs_pgio_header *); - void (*commit_setup) (struct nfs_commit_data *, struct rpc_message *); + void (*commit_setup) (struct nfs_commit_data *, struct rpc_message *, + struct rpc_clnt **); void (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *); int (*commit_done) (struct rpc_task *, struct nfs_commit_data *); int (*lock)(struct file *, int, struct file_lock *);