From patchwork Wed May 30 18:05:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10439517 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 6F3AA601E9 for ; Wed, 30 May 2018 18:06:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E537290F0 for ; Wed, 30 May 2018 18:06:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5332D291B0; Wed, 30 May 2018 18:06:23 +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 D8874290F0 for ; Wed, 30 May 2018 18:06:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663AbeE3SGV (ORCPT ); Wed, 30 May 2018 14:06:21 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:36205 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753641AbeE3SGU (ORCPT ); Wed, 30 May 2018 14:06:20 -0400 Received: by mail-io0-f193.google.com with SMTP id d73-v6so22696710iog.3 for ; Wed, 30 May 2018 11:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G7p0uCwkpuPsBUxs4yqfexHwN8CgtVtG47pvAhSxkRI=; b=FDjhByvMg62vggahpVQZdswsKN2u+NK5jSlXHtBjMf10vJbcvR7c544RR/1aK8KpDT jxibjJUGaFkCa92jaHrfi7FFpIfntkitd7DifoOyREall3lACdYUVklDkMqjoJHQoK2I FdlDDg4pI1MiKledT3Y0hfUeDvP2IxRKkWtvdu4iIJdwU8AMQdB772PNtcfDBcynyuBX GmCBcFuM09Y9EdxOh0JLQM6X2XWqmD44yiBpEYOE5kAG6NNrOQhJzf0heSJHEPc6iFVW rZK64OOZltPAET0EvSEwmhlD/IoewoAo3Ex3N5irwBlMg51WcuzvFo50A9xt6BiQI9t8 PDGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G7p0uCwkpuPsBUxs4yqfexHwN8CgtVtG47pvAhSxkRI=; b=asfxVh9rS9qbEaDrM+M9eSJuQ1nGhNjC9IUCuj0z70xLae7r8Ytt52LXP1BxULrRRS zzxFzoU9qQnykCqF3tUnX46KwVLYXCVf+YxYgHPBbCefCGmV6Da/CatB2yt7wwnL1lZ9 9U/GFAgTcs/ai39nBcyUNnS0RQ87YFYNjiBy4QW7NjM3aHZhhMfLtx5YrfJe22TkLvA6 EWI43ytg372ASRluf2jhdY3/vDu/lPK8lXDB+x3PPxttx5LB5YL9tblXAc9WKaoF4ABc bVsb7ubvalhqSTmpAuvZISK4scKO8bZhFuSjJkQQw3HlWvs8sdGsmc20ecRouX3gCAJV mE3w== X-Gm-Message-State: APt69E00R3QAOrEV3SbJubuWytT5W9npZTdTgRoHKWSKWQfQvZ701J8a vdOZrJeyuLd2h9D/03S/nFXZSYc= X-Google-Smtp-Source: ADUXVKKZyj/puBGWWM6dDM4oE1v8eACLveNCS5Osxe7oju/3Mk3TfsCybOGf8Queg7H5wCa2EKw+WQ== X-Received: by 2002:a6b:f914:: with SMTP id j20-v6mr3382282iog.238.1527703578954; Wed, 30 May 2018 11:06:18 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id i201-v6sm8589368ite.33.2018.05.30.11.06.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 11:06:18 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 03/19] NFS4: move ctx into nfs4_run_open_task Date: Wed, 30 May 2018 14:05:37 -0400 Message-Id: <20180530180553.38769-4-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530180553.38769-3-trond.myklebust@hammerspace.com> References: <20180530180553.38769-1-trond.myklebust@hammerspace.com> <20180530180553.38769-2-trond.myklebust@hammerspace.com> <20180530180553.38769-3-trond.myklebust@hammerspace.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-Virus-Scanned: ClamAV using ClamSMTP From: Fred Isaman Preparing to add conditional LAYOUTGET to OPEN rpc, the LAYOUTGET will need the ctx info. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6287fb6dee50..830569a8d00a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -86,7 +86,6 @@ | ATTR_MTIME_SET) struct nfs4_opendata; -static int _nfs4_proc_open(struct nfs4_opendata *data); static int _nfs4_recover_proc_open(struct nfs4_opendata *data); static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr); @@ -2328,7 +2327,8 @@ static const struct rpc_call_ops nfs4_open_ops = { .rpc_release = nfs4_open_release, }; -static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) +static int nfs4_run_open_task(struct nfs4_opendata *data, + struct nfs_open_context *ctx) { struct inode *dir = d_inode(data->dir); struct nfs_server *server = NFS_SERVER(dir); @@ -2351,14 +2351,16 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) }; int status; - nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, isrecover); kref_get(&data->kref); data->rpc_done = false; data->rpc_status = 0; data->cancelled = false; data->is_recover = false; - if (isrecover) + if (!ctx) { + nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, 1); data->is_recover = true; + } else + nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, 0); task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); @@ -2379,7 +2381,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data) struct nfs_openres *o_res = &data->o_res; int status; - status = nfs4_run_open_task(data, 1); + status = nfs4_run_open_task(data, NULL); if (status != 0 || !data->rpc_done) return status; @@ -2440,7 +2442,8 @@ static int nfs4_opendata_access(struct rpc_cred *cred, /* * Note: On error, nfs4_proc_open will free the struct nfs4_opendata */ -static int _nfs4_proc_open(struct nfs4_opendata *data) +static int _nfs4_proc_open(struct nfs4_opendata *data, + struct nfs_open_context *ctx) { struct inode *dir = d_inode(data->dir); struct nfs_server *server = NFS_SERVER(dir); @@ -2448,7 +2451,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data) struct nfs_openres *o_res = &data->o_res; int status; - status = nfs4_run_open_task(data, 0); + status = nfs4_run_open_task(data, ctx); if (!data->rpc_done) return status; if (status != 0) { @@ -2799,7 +2802,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, seq = raw_seqcount_begin(&sp->so_reclaim_seqcount); - ret = _nfs4_proc_open(opendata); + ret = _nfs4_proc_open(opendata, ctx); if (ret != 0) goto out;