From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E3E54C9554; Thu, 11 Jun 2026 17:50:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781200260; cv=none; b=JUQbLc15KLA8lxFTkMz9UhFJ9+vWzPHtfQWH6mg2JvptW5Q5e9BTKOANKpZ/XDc96rGkerhox9x+PMF2GXPTGi5BSq0Tu9YZRWqAah561A4T5Ob1oU/zPQJjOz8qkhZH5QKaCROIz4LwsYt7ao9L+gPEqNkYRf6joqlL49MGc+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781200260; c=relaxed/simple; bh=wGyTokg3GKElfqJgrUe3TxVbVZk4gjS9Piw+ozcUGeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vhrier1hM9QoHhx5iViy7yaZ8hEsFdxrDrO/Tw/zHxKRJRz0dwg3jAab9cGJaPxKkJHpCqwfvGKIP25EF8X2dD8x2NKKNiYZM6LZyn5N2P1VEu4jZYPPlyGC3diraAqeN0uIkZp7JweGJaa/LVs2gkkDf/aD3IvtQ4ddtmyjFr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h3/hvpXS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h3/hvpXS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 375831F00899; Thu, 11 Jun 2026 17:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781200254; bh=boUS2uP29CUMjPXaPJlVrj6lCotQJXHMxNRB/47GSTo=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=h3/hvpXSuyz1eMKbduGBKbrW7a1r/0RHY/SB62k3V6soxSaSWR1vG3187Yn57+vcX Q+XLwecaOFUOdC0Eao3gFzWJmwKkj3gVVrHTe5xuNI++59gy0pUyCt1ED8rr+vBj7p mM9w6EXBrUOqkjS6womUAb3u9zQoU4gdCW2Z3+m1H9mDpFs4MQJBAvU6JnyG2o78T8 9GsAI/FTSBaBAWNl6/2WhOP0ARA3rfmcOD/Qr9eTI5ljmPEwmGDv/sndBgHz/GtmI3 dcHWuTc0CSNH7t3p5rl4oKVcz63Ukd7xaebMGg/iP5rGsiWPJvAXRr7/HhpZM9wPNL zbVkcusxi9r/w== From: Jeff Layton Date: Thu, 11 Jun 2026 13:50:18 -0400 Subject: [PATCH v6 12/20] nfsd: add helper to marshal a fattr4 from completed args Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260611-dir-deleg-v6-12-4c45080e5f3f@kernel.org> References: <20260611-dir-deleg-v6-0-4c45080e5f3f@kernel.org> In-Reply-To: <20260611-dir-deleg-v6-0-4c45080e5f3f@kernel.org> To: NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Jonathan Corbet , Shuah Khan , Chuck Lever Cc: Steven Rostedt , Alexander Aring , Amir Goldstein , Jan Kara , Alexander Viro , Christian Brauner , Calum Mackay , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3412; i=jlayton@kernel.org; h=from:subject:message-id; bh=wGyTokg3GKElfqJgrUe3TxVbVZk4gjS9Piw+ozcUGeY=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqKvVh2+hnPzb54Y1u398dAJ+ySepQoggcUsADU pSr3qrxoSuJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCair1YQAKCRAADmhBGVaC FaSrD/9VLU61VA/Hq5PrCVRw1JMz099EAQfnA6XLVwJn51G/MfcCJPa2eSd/er+8ljjjZ6pYpZr YJbxiOvaF6bOLhTwPBWOEuu9F5Y+xlhSCx6LdqfYXZUMeTsXpJoF59PBwBhno3mpSE2u2vGdq10 y1lIctNZ2Eczm+qAvcNvxkCFEB4oQUwPdWYYYgDjiduZdr7Zwq7ncIrvmbfVdcs8S+Mahc8eiTm Anxiy1WHvG6s+MR4ryXHXRy/eAlYJVQahauPbj1aGXGrv643EJ6HVGHE7SMZZRhzERWAaSnFEoi Hvfre3sHLxdAQk8XbHwuca5udSTQNUHIW3rOWKjzaQfMQJm/Jj5GyBJeQb2M/XlE3tjrDDeDz8n ptIOlSLAqSieZoJQf4b6DhCE/Z1Rtcmik7EQw71ZTtYoOb2y+wbyAxNQzA7Q3lShkO0o+gg65Vh /z7bIyb3UtxYG3pb6METPlnTvXvpS4AqQqKsnuzNVjCgVM/yFAsuoM2VG+OdTJRBTxnlSTCaUyw LxrY0AYTW1gEYl6e3D3/vHFtcqm32VHtXG9IgipMI49KaYbdziffDfXZkJE3b+XGkFJgGu5lnbx 3bCZ5+oRNWCT/eQTyMjR37cs8ZXbWb8UrWZyaGxAodM9DHL4KTSDgejLIM/ri3YhKtGxT613Sg+ TG3ZWuu31vDvILw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Break the loop that encodes the actual attr_vals field into a separate function. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index c6f92ddeb449..7d162e5fb6ec 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3895,6 +3895,22 @@ static const nfsd4_enc_attr nfsd4_enc_fattr4_encode_ops[] = { #endif }; +static __be32 +nfsd4_encode_attr_vals(struct xdr_stream *xdr, u32 *attrmask, struct nfsd4_fattr_args *args) +{ + DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); + unsigned long bit; + __be32 status; + + bitmap_from_arr32(attr_bitmap, attrmask, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); + for_each_set_bit(bit, attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) { + status = nfsd4_enc_fattr4_encode_ops[bit](xdr, args); + if (status != nfs_ok) + return status; + } + return nfs_ok; +} + /* * Note: @fhp can be NULL; in this case, we might have to compose the filehandle * ourselves. @case_cache is NULL for callers that encode a single dentry @@ -3908,7 +3924,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, int ignore_crossmnt, struct nfsd_case_attrs_cache *case_cache) { - DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); struct nfs4_delegation *dp = NULL; struct nfsd4_fattr_args args; struct svc_fh *tempfh = NULL; @@ -3923,7 +3938,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, .mnt = exp->ex_path.mnt, .dentry = dentry, }; - unsigned long bit; WARN_ON_ONCE(bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1); WARN_ON_ONCE(!nfsd_attrs_supported(minorversion, bmval)); @@ -4137,27 +4151,22 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, #endif /* CONFIG_NFSD_V4_POSIX_ACLS */ /* attrmask */ - status = nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1], - attrmask[2]); + status = nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1], attrmask[2]); if (status) goto out; /* attr_vals */ attrlen_offset = xdr->buf->len; - if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT))) - goto out_resource; - bitmap_from_arr32(attr_bitmap, attrmask, - ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)); - for_each_set_bit(bit, attr_bitmap, - ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) { - status = nfsd4_enc_fattr4_encode_ops[bit](xdr, &args); - if (status != nfs_ok) - goto out; + if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT))) { + status = nfserr_resource; + goto out; } - attrlen = cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT); - write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, XDR_UNIT); - status = nfs_ok; + status = nfsd4_encode_attr_vals(xdr, attrmask, &args); + if (status == nfs_ok) { + attrlen = cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT); + write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, XDR_UNIT); + } out: #ifdef CONFIG_NFSD_V4_POSIX_ACLS if (args.dpacl) @@ -4180,9 +4189,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, out_nfserr: status = nfserrno(err); goto out; -out_resource: - status = nfserr_resource; - goto out; } static bool -- 2.54.0