Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1596242iob; Fri, 29 Apr 2022 08:37:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAFVuz+8a9+p/PA0MG7bAGcZds6D/oRbqkBksa001nJtT286fRYrZGkiFyU/FB81qeWUsD X-Received: by 2002:a17:90a:c3:b0:1ca:54c1:a684 with SMTP id v3-20020a17090a00c300b001ca54c1a684mr4553697pjd.148.1651246631738; Fri, 29 Apr 2022 08:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651246631; cv=none; d=google.com; s=arc-20160816; b=GUn6B+7ocn7DjBmI3x38CS9B7gn+KaWlbuLD+aFuQXRwjdZz76lVc4HPBIjcPPbqNR WxnHA7ulGU5vxGn6yaUBuNl+s26PEKkFJFYYGcmJA9Zc1N6yFw6AH+F1Pl0B5qaD7m9e ppiE1UmR3Sh0WV41iJRPWW9ftcVx1J0pZp3aMMgC8SkubAz8dEnQKjBJ5bVVrBcl/GIh IPU/rRRavomr4nby755XEWk7aXE1jsS1NOxUJiAipGrN9U2ug5bKZwVOdce3Fg72I3zH gmGXCcOp5Ed1sXSS/pUy5KKHbMg+Kf8SpNnDOdOW3P6JJ9UIT3igAI+MunZ8PfglhyMq rmZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject; bh=X+7fbG4/4/rXey/KzE+D/ua4kL+NXx6U6r24cFTLHUQ=; b=RWeQj7hAvA6fDPfXTBqTS9XWoYx9xs7KQ7HbRzH6mQDtESmoQRfWUY8kQa9OD2EqPA jZQ1A8wqD8veXPYhWiQKqpmujTvcyAQBcdLvXB/6751RYeBQwcoRcBOY67JqbvbZvO9t syrFSrIIrlnpnHOpQhDUu6uZG6ZYnAOPyqhCTIcGH8/ThuSac6zguK7jjPr9qhdQcwz9 sKYOH2HzyUaNr3GvgPiFLHfiZ2DZ7uD+n11H/tmfXqPb67AIaBn1U9Wa67M1hdRkw54W BqZoROG7Ie1Mv3RcZGapzJBuhot1YYkbp/OBcWLSDSV7+68n+LpgIuHn0qIQjnmB9pxZ Yu1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t8-20020a17090a510800b001cd658e7640si9802988pjh.43.2022.04.29.08.36.47; Fri, 29 Apr 2022 08:37:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377978AbiD2O5X (ORCPT + 99 others); Fri, 29 Apr 2022 10:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377330AbiD2O5Q (ORCPT ); Fri, 29 Apr 2022 10:57:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B45D3C3EBE for ; Fri, 29 Apr 2022 07:53:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 69E2BB835DB for ; Fri, 29 Apr 2022 14:53:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B4A0C385A4 for ; Fri, 29 Apr 2022 14:53:50 +0000 (UTC) Subject: [PATCH 3/6] NFSD: Move documenting comment for nfsd4_process_open2() From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Fri, 29 Apr 2022 10:53:49 -0400 Message-ID: <165124402926.1060.11916783684271494269.stgit@bazille.1015granger.net> In-Reply-To: <165124376329.1060.17013198516228928515.stgit@bazille.1015granger.net> References: <165124376329.1060.17013198516228928515.stgit@bazille.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Clean up nfsd4_open() by converting a large comment at the only call site for nfsd4_process_open2() to a kerneldoc comment in front of that function. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4proc.c | 6 +----- fs/nfsd/nfs4state.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 05ec878b005d..9dbce52f0f33 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -628,11 +628,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_inval; goto out; } - /* - * nfsd4_process_open2() does the actual opening of the file. If - * successful, it (1) truncates the file if open->op_truncate was - * set, (2) sets open->op_stateid, (3) sets open->op_delegation. - */ + status = nfsd4_process_open2(rqstp, resfh, open); WARN(status && open->op_created, "nfsd4_process_open2 failed to open newly-created file! status=%u\n", diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e7c28ddf2538..899bcf9cd612 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5332,6 +5332,18 @@ static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open, */ } +/** + * nfsd4_process_open2 - finish open processing + * @rqstp: the RPC transaction being executed + * @current_fh: NFSv4 COMPOUND's current filehandle + * @open: OPEN arguments + * + * If successful, (1) truncate the file if open->op_truncate was + * set, (2) set open->op_stateid, (3) set open->op_delegation. + * + * Returns %nfs_ok on success; otherwise an nfs4stat value in + * network byte order is returned. + */ __be32 nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) {