From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A946C3A759D; Tue, 28 Apr 2026 07:11:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777360313; cv=none; b=QIvHuHNZQYtQpJI0tFzgANGXTsn7GwKnkXfqBKGCC8n6DcC4mg8dbTjrCiWHQ9mUJihamlXMsn3y0klXwGQ8OeqbngRqQWD3S0UN2ZvkAfwi1AwJ00JcRprGlXICbPettCmwD6r3EYblEr5enRGtczXmitNr8LgOiyyTZIPg+OA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777360313; c=relaxed/simple; bh=8oOOjvuXTFk3ATyKMsiMxYSTQ7+G0noB6pHdXQXznvk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DcR0BH4wSqD4eDc8ysTTI1XwcRxaQiy6p9BobaKcQjDt2HlR2j8DUVqZJD4s+7tK5n60W4OH6ysEQJtv5BuMR2QSNNOfofL9ze2BitIH8ScbxwNiRX0RC2aEruttZHfXfddiNXSvYg4ligVqp+5GvHmTCSs7MkGFEbOWQ3qVxvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ACmTlh6L; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ACmTlh6L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72010C2BCAF; Tue, 28 Apr 2026 07:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777360313; bh=8oOOjvuXTFk3ATyKMsiMxYSTQ7+G0noB6pHdXQXznvk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ACmTlh6LiLGKo3z+ywpGZindiSdLrbZHQ5U+MFmyBqVS+SyMskjY1wtRB0bTNy0Z2 Nei4+G39+LV13Im+1gDGQQIIbct0U3inXdWEznL8R9mC7d55x7HD/HXOdKf0zAIWKL 36H+XzNNMymCrWgAoJYoj4sNIPNPVHBTJGiz3IkDU/ho0ApfYk0tT5+mVBHZN8KPQK hGhP/pNPeJMrh0GiTWrR67grbO/XUZDwCDx8rXSSeA2ZFTT5bo8Xjini0xV9Pe8D96 3l4GXNfHNBDXJxS8blEa1ALp6UXtKUWv9nztCrmP6qvmUVpvg5Lx1EHzdQQ7+//VxC F4+BUEtvzckhw== From: Jeff Layton Date: Tue, 28 Apr 2026 08:10:04 +0100 Subject: [PATCH v3 20/28] nfsd: add helper to marshal a fattr4 from completed args Precedence: bulk X-Mailing-List: linux-trace-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: <20260428-dir-deleg-v3-20-5a0780ba9def@kernel.org> References: <20260428-dir-deleg-v3-0-5a0780ba9def@kernel.org> In-Reply-To: <20260428-dir-deleg-v3-0-5a0780ba9def@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Chuck Lever , Alexander Aring , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Amir Goldstein Cc: Calum Mackay , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-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=3351; i=jlayton@kernel.org; h=from:subject:message-id; bh=8oOOjvuXTFk3ATyKMsiMxYSTQ7+G0noB6pHdXQXznvk=; b=kA0DAAoBAA5oQRlWghUByyZiAGnwXVKgScw5x6+7fcbzZcpsZfBYCAcEcgu/2uBP01kua2DSy IkCMwQAAQoAHRYhBEvA17JEcbKhhOr10wAOaEEZVoIVBQJp8F1SAAoJEAAOaEEZVoIVskoP/3tI A5TcqOHQdXGPBa81Saa/JhMZO4Iks7tr7jNaRAn/aQa/2z00gzdMhVQj3ZqpqQA/OtUBfCJp+F6 sYYhLDucC1S7eB6jEJeqegyaCHfJZmOIVkQxULke0J1a21keE39wqTJ2NzXFmm69Owq/PTNXMBc JQblX3GtImewTU079TARgmJZrcG1Ezz1VjVpQBgbA3N6wR7MI8kGxBWvDjj2mXcFebUq/dhoGyH MjLAxtiLQOAH0Tfl+iFE7gnUs4OeSHLhQyP2EdXZN1OZh5xW5VeOWT/auVGzT1hGqJaVUstBZ8l JS6p+V7qWEKEDaEeiXgEBVc9i0H+zulUvYTN9J3SNy/FsKyTxWkPU0r+o0lhf0zJVaQlHdxOzA4 fOR6XDzpIOZLFSFba2f6ohkycZJOcSnDuba/I+f7MrEsLAdee4m4bsczqACthHyS9opnhYGaVj+ t2EVeJR+8kD1AZryw/twsLjPZArRDZ06mSbTduhBazGygeh6hTp7K+eGCcTRMTBzAH8A51+x3xC 654gQsNXu7RbI1IHEqH9v9Ma7GoVjZLoPlYS2nMYEWGz/ofB01BxHyYKGel4WnAqHTdgnXfmHTa FF1Q1lFyMOmUB7189J6MVBp5mtTjUeh0CbcZ0fJRJKdU+MuUa4i7qkclVezWQdBfAcuYN2lY5Gs pTneN 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 8af1e15e1102..b9b173ec7421 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3852,6 +3852,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. @@ -3862,7 +3878,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct dentry *dentry, const u32 *bmval, int ignore_crossmnt) { - 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; @@ -3877,7 +3892,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)); @@ -4050,27 +4064,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) @@ -4093,9 +4102,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