From patchwork Mon Sep 18 13:59:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13389800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13168CD37B0 for ; Mon, 18 Sep 2023 15:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230307AbjIRPUR (ORCPT ); Mon, 18 Sep 2023 11:20:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjIRPUQ (ORCPT ); Mon, 18 Sep 2023 11:20:16 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04F7910DC for ; Mon, 18 Sep 2023 08:18:39 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BBC3C116AE; Mon, 18 Sep 2023 13:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695045568; bh=Yegaz6cGZwJJsAj6SZEdsba96jxIHs4Vb/e5LSdFc2w=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=LJrxFs/OLvszUeCrNZDBg33LCNZFxzysf7E99ijpNYVjYDiM3WAcf9M3IKIwmIvQ7 6t6I2qEEiS+qR9xL+54KClJJFFxhgq1NXTNXXUuUALV0Yc8kg05j4Efa6HrTu4F6Ku nGEQqv3sazGx7XwZFVUzQA6lh/M5TXxdKXIrwVfweNT5FXQ36cz5b5bamo7L+SHeKZ g7e4Kb/OMWriNG6uVxN4YL3nUsfXAnOZkHox8ng4bBO9UhfS08a0Dj5T216IVQIRYM afWii2ofHpexhaL83w/t45l3cSykjYaFoI4Ld513tA7ymnLGRwscvSMO3DVdsoNml2 hIvTpydb0uxbA== Subject: [PATCH v1 25/52] NFSD: Add nfsd4_encode_fattr4_maxlink() From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Mon, 18 Sep 2023 09:59:27 -0400 Message-ID: <169504556726.133720.8757481551055565977.stgit@manet.1015granger.net> In-Reply-To: <169504501081.133720.4162400017732492854.stgit@manet.1015granger.net> References: <169504501081.133720.4162400017732492854.stgit@manet.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever Refactor the encoder for FATTR4_MAXLINK into a helper. In a subsequent patch, this helper will be called from a bitmask loop. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index eb7bc713f85c..05d3b4409d03 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3158,6 +3158,12 @@ static __be32 nfsd4_encode_fattr4_maxfilesize(struct xdr_stream *xdr, return nfsd4_encode_uint64_t(xdr, sb->s_maxbytes); } +static __be32 nfsd4_encode_fattr4_maxlink(struct xdr_stream *xdr, + const struct nfsd4_fattr_args *args) +{ + return nfsd4_encode_uint32_t(xdr, 255); +} + /* * Note: @fhp can be NULL; in this case, we might have to compose the filehandle * ourselves. @@ -3412,10 +3418,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, goto out; } if (bmval0 & FATTR4_WORD0_MAXLINK) { - p = xdr_reserve_space(xdr, 4); - if (!p) - goto out_resource; - *p++ = cpu_to_be32(255); + status = nfsd4_encode_fattr4_maxlink(xdr, &args); + if (status != nfs_ok) + goto out; } if (bmval0 & FATTR4_WORD0_MAXNAME) { p = xdr_reserve_space(xdr, 4);