From nobody Sun May 24 18:41:29 2026 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 D23D622A4EE; Sat, 23 May 2026 16:17:41 +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=1779553062; cv=none; b=N9Fg6cQoQ0g5WJEOKnVsE9TSd3ZFR0+7Ep4tUM1efwRy61n24ZAuH/WOIVW9EFUfD/sGqua+th5dfy17Uh5swpWk/zCoRXRT/URKN9PJxwonIahNZ1ZcBmsKL2KnV6XoP8Tc8+N2rZRTlrrguEhcV9HAFIcS/b3KFKwmfQLQF80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779553062; c=relaxed/simple; bh=x1fAb7qeTFbcK02DygPDSguOWqiqmcaEiZa0YrbM1FE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uqzMX3waDKua1/xN/0VIOCHQqcLIcGPngd5Lhlqfuzawx22LVrmlFMlW2I8pcotayz3nb9IBFBbWtW6NVB2vMRe4J8mNFw5NitVNZmfxQBs9zojnbYEcWUvtglWQPvOh5zfNuyHEng2+5pPi08qvq5TxTfs35mbZbJoUQurb7zg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OBeY+Xvr; 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="OBeY+Xvr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04EFA1F00A3C; Sat, 23 May 2026 16:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779553061; bh=zZTLvdfyZfQnACyeuJT0lpOyJDhgRcx9Fe66L5RJbY8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=OBeY+XvrhOJYaUhkNeBmIHLWDd+cSwtN6ZS0VLPQZCAaNY3xaL1eaZ0ed/XnbXEI5 HQYWhyWeAdKJ6ew8cpKWGIaMg/MManr1uVKV0LaCc07WxsGxYZLPhNXA3EMJ6snGDG 0nYF3YfCwopktUjduHRNM26QTzKghP3qPlHHQMXHAAC5av8KlHKHV9jNfBK01uWPmN iGWdQdPu/+OMZpIlPQhQlLnefFEzWmmIUU1/R2eMs9e0v5hYLP3klKWJucrYvKhvKG Pm3nEShHj5RIcKI6+okSwx4xfoAqZcF93TDvx6Duq42JK+VlvoVgxOgnqyZAn9AzHJ CEFJ24x3PSNkw== From: Jeff Layton Date: Sat, 23 May 2026 12:17:34 -0400 Subject: [PATCH 1/4] nfsd: check for FILEID_INVALID in setup_notify_fhandle 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: quoted-printable Message-Id: <20260523-dir-deleg-fixes-v1-1-142c884f85ce@kernel.org> References: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> In-Reply-To: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1084; i=jlayton@kernel.org; h=from:subject:message-id; bh=x1fAb7qeTFbcK02DygPDSguOWqiqmcaEiZa0YrbM1FE=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqEdMiT1mfRWREbCBvqDOdSAm4D4x1q4JWqa85z HGMCtj+yA2JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahHTIgAKCRAADmhBGVaC FW9gEACp5aiZtgjKdn6Hwmk8Zv67DVQqa+4ED8M6VNy9cbAM7ggPTBd7ywcbuZlatWxs3JgQouQ tdp/Zipx00jgLlt4DZ19a8kbx/EgkrNpwHHHtsxnXRtKJws182paLxMaIntww5sDq1b+JSFYC3w xJzYzdtWK5pnUDslxOaBNXkVlaHPZXRFeDjw12cQNZkmK3dF+uEiAztBonSkbhqUTulrfa6IIy5 X80jG6saz944F6udUdumwKDtxqj2qAVMq39fDDIJUFaALvvfsByx9Vb1vyh1tA5Q7dIxwlVsF04 7rqterqsQbmvVeqn9OlslrD71P3nBz1hj0lPXwoxCFdT3B3EQJjm4eVbla+iWiq1Bu9KPtlwuM8 dwUcS2mku3AtrTBpCHLE3wBM5pMxl6PGJFC3weZJIIHpH4Wyc87KXIFQ36Wtu2ohoPP55i94adG Pfsr/ZcO574+6Bl5L3l5nPOD9HXk9w9PLK7PrMQQjc4QTjTpyvAgkR4lUmhIVQuOZXJf1Z/xrQW PAm8alM0x12HT9hbTxGvrrvSvDtJavcmxmqePqt8Jo67htOmbTT94wxC6qxRK/z2Kf/oMnSicNQ qbyl/301jvIv4tvgat40hYgrnuRtDpVM6gXqkZn75cYOL8pt2g+6zJFu1jt/auVMQ4LOyGBy+07 LsOdfjIax8vaahw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 exportfs_encode_inode_fh() can return FILEID_INVALID (255) when the buffer is too small. Since this is a positive value, the existing check (fileid_type < 0) won't catch it. If this happens, maxsize will have been updated to the required (larger) size, and fhp->fh_size could overflow the fh_raw buffer, leading to an out-of-bounds read when the filehandle is later encoded onto the wire. Add a check for FILEID_INVALID alongside the existing negative return check. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2143fb6d5e3f..2f8d26601581 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4209,7 +4209,7 @@ setup_notify_fhandle(struct dentry *dentry, struct nf= s4_file *fi, } =20 fileid_type =3D exportfs_encode_inode_fh(inode, fid, &maxsize, parent, fl= ags); - if (fileid_type < 0) + if (fileid_type < 0 || fileid_type =3D=3D FILEID_INVALID) return false; =20 fhp->fh_fileid_type =3D fileid_type; --=20 2.54.0 From nobody Sun May 24 18:41:29 2026 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 E1F4C31691A; Sat, 23 May 2026 16:17:42 +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=1779553064; cv=none; b=AhKgort9fGn9MxxukupO5XIidd74AyGiada7z6eJwLvBVugfLdMdH1VBDGexV8Y9jVaJbuKyMFC7ijnjoI5CL1s/T8NQ835O38I4id7Z2aT1+mKg+NjClZ4zyqZAF4fh0eBx1jmDnqzbbGE9USwE69x9BO6kKRIkXee1C8Y+VIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779553064; c=relaxed/simple; bh=+w/vqGVSogzDzldgqsaBUVziSOav81+ONlsyh/zZvU0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mW9XDHkSql3MKB+9Mucwnmm3sF8n9OK+Q7YfiCI7eNd8MbNA4KjQOVEoO65kumQF8p8yZjoGm+v/7Gl0shR6D8B/9P9LGUDksDAUpARfgOe4a+65elLlRXdtpQi8NvX1m+Amf4+kfI1BPK9INxLfQgLDNnDh/0G6SmJfZ5iHan0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SQVtopwQ; 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="SQVtopwQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB9231F00A3A; Sat, 23 May 2026 16:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779553062; bh=w5WUrg12vKsMgDhSRfjrdrxE4KdymXONHR28Df9OUFM=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=SQVtopwQtiN+5CSbE8BJ4pJWc7STXyYKr5hE9jCgrmciRGpEztAO3YiZLAFVlzB36 dt2POlKIfElq+DaHH4SdEZ8S+RSxrJ4vWWXZrNNh2ywPdvBizjkC4NSeWAmWSs6TVg nsdtfSUh+omqIXd3/Tl1hK/0AifGo+n2XZa09IK0d7FvnI0wv0O4RHhbMRVV0Q+k3+ HbB+Ep9bx1bV5GhWFijj1viQy8U55hxKTor9qVyFiFAeYfaYkJeUwgL8h9UoWpljkv 3l2BzsW4M/p8gACO9OWAviDbs4V+w7xjEkM1UxoVTXQfWcAQdxwn0yfc0Hrd7esE83 DcfAMHMbrylxw== From: Jeff Layton Date: Sat, 23 May 2026 12:17:35 -0400 Subject: [PATCH 2/4] nfsd: use empty string for directory name in NOTIFY4_CHANGE_DIR_ATTRS 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: quoted-printable Message-Id: <20260523-dir-deleg-fixes-v1-2-142c884f85ce@kernel.org> References: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> In-Reply-To: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1645; i=jlayton@kernel.org; h=from:subject:message-id; bh=+w/vqGVSogzDzldgqsaBUVziSOav81+ONlsyh/zZvU0=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqEdMjl3UpaRtiHQS3dvMUISNpCcIau/fozDdNW GE6Mw4vr++JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahHTIwAKCRAADmhBGVaC FVTaD/sGCjs+vc4jP2z/+zmpF2tG/wZ1xAifyHbTD0Hb+fnlD/OG5F0xvamPe2Yvv2axA3yHUrX 270jX5iEr0NlY9oARcZX0/lj7GgSVMUzqHDXWZh3XTGFtJGkmC/ssOY5k6V58WNCJ/6wthAm3Lq PCTzkxI4r1zzTkAoyaC2MingRSdbz24z4D4GUp1l2eCpIPE40OSjunV2VSCihaTVdank6HPj9Ec A8MdZ75wp/EJWnTjKzXNz8KR6tDB//Tpo5j68MTukm0i2KG1OhTNLdwiZKe4lzrNQjd/w/9yaUo V1CtIQ8cCZNOfTSPi7QV+5iu/LXJjLNNca4kPKabBlqG7PBkkQd+GeBe2a2YkORVIAB46L0wEIG 83m9eMriUzuPrymILzpRkPAVkFE0RX9UkEJwUeN8Ot1WSHshm7VbOVFT9BlkCFmOniba+SExZam Zwesiw8F5zaZF3nccZmTWT7ZZ2yxxLGUVQqf6jQAUMWwjUpGkXprblPc8Eqkxj8HlvOuBWzQZuM omOxA+SE2Hm/IgAtMU37NsmIH32HYfz19o8IuXLCfjUkOjxbGPJFvMyg6BpIM7DRaA82cuCJrvP c4gnw648AwyPbZbB2i8fhnJpim8nm9Yj6GGl32Avg0jV5Eqj/80iDYGuP1QQzW0riuJfA06P8rD g7MwxMICA6xvnLQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 RFC 8881 Section 10.4.3 specifies that for NOTIFY4_CHANGE_DIR_ATTRS events, the ne_file component name must be a zero-length string. The code was incorrectly using the directory's own dentry name, which could leak the local namespace to the client and cause cache confusion. Pass an empty string and zero length instead, and remove the now-unnecessary name_snapshot. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2f8d26601581..c6c50c376b23 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4404,17 +4404,15 @@ u8 *nfsd4_encode_dir_attr_change(struct xdr_stream = *xdr, struct nfs4_delegation { struct dentry *dentry =3D nf->nf_file->f_path.dentry; struct notify_attr4 na =3D { }; - struct name_snapshot n; bool ret; u8 *p =3D NULL; =20 if (!(dp->dl_notify_mask & BIT(NOTIFY4_CHANGE_DIR_ATTRS))) return NULL; =20 - take_dentry_name_snapshot(&n, dentry); + /* RFC 8881 s10.4.3: ne_file must be a zero-length string for dir attrs */ ret =3D nfsd4_setup_notify_entry4(&na.na_changed_entry, xdr, - dentry, dp, nf, (char *)n.name.name, - n.name.len); + dentry, dp, nf, "", 0); =20 /* Don't bother with the event if we're not encoding attrs */ if (ret && na.na_changed_entry.ne_attrs.attr_vals.len) { @@ -4422,7 +4420,6 @@ u8 *nfsd4_encode_dir_attr_change(struct xdr_stream *x= dr, struct nfs4_delegation if (!xdrgen_encode_notify_attr4(xdr, &na)) p =3D NULL; } - release_dentry_name_snapshot(&n); return p; } =20 --=20 2.54.0 From nobody Sun May 24 18:41:29 2026 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 CD09C31E835; Sat, 23 May 2026 16:17:43 +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=1779553064; cv=none; b=aH99t5h4CelSyDrl/vn4HZw+d7q17mixofAdnKjdN3y5qnTyR9bsTmTh5XcZBf07gaN3QmC7ygfv9wFxpNqMqUHa9pXevvtDQ8toxdqjOMzFxUX7KHtCr2UPHZCtbkbmhV7ja95q7A0o/3ibwHxYewGuZnFaM9oSk4UTYALSkKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779553064; c=relaxed/simple; bh=50Jjd/MZcYcuzk0DIxXK6q4r6I98G+V7MPGX5Tl64qc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nUHHnFUo1CXfJd2u3MQNI52j5VJZObV6DNNClDobqMCQZxJZRCTlAvA6SR1Xim9Gq0ivuLaDz4yZIe6jLDZGXxhuDrnLJqQK/vz2ct25toe5JiX0lJwXuEX3uqGC65LuhJmEy0UsPQxCHvaTmTml7DGlnIcinf97vrEgv/dmFis= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aF+o504t; 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="aF+o504t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE0521F00A3D; Sat, 23 May 2026 16:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779553063; bh=AqZiBDPYP2NRvY18IQ+oxkT1uHBglTinZPjZOnLjYBc=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=aF+o504t9+gkGRUbuF1LzUqOe/7wlic3DEBH2n8fT2Qjh+8j54Fd6VZ9E832alDx9 StI3JHPLYHCY2bI3OqUQz/HP4SrwAw8hZLMfMyDhfe63S8ohn+Nl1e508dry1AavcR AtaQQkOyVybPdxIp38rVOaRw5rRKyXplKlOxuWS7YxdmerTipyFuXbbjRHUASBErBC x7VwP+z8CGwMK0u89AvXTiUQjA6MWJrpR/jw7k9kUrcsGPan6RTR7KirUBuY/4m7fQ X7V8W4Lx9rC+nCTsz4dKqxPeU/AGPiH5sLHErQt/lPkJyU1d/OYSuVl8KNtMuAZrNs CXcYVNj+RUvXA== From: Jeff Layton Date: Sat, 23 May 2026 12:17:36 -0400 Subject: [PATCH 3/4] nfsd: check delegation status in nfsd4_cb_notify_done 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: quoted-printable Message-Id: <20260523-dir-deleg-fixes-v1-3-142c884f85ce@kernel.org> References: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> In-Reply-To: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1073; i=jlayton@kernel.org; h=from:subject:message-id; bh=50Jjd/MZcYcuzk0DIxXK6q4r6I98G+V7MPGX5Tl64qc=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqEdMj2uDZbkO24OxzerFV21OkVnkmLKXt7Yi7c d0OUIyooBuJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahHTIwAKCRAADmhBGVaC FaTvEADGMcdNQ8bMA5p08DVhWzN38XxWmOC6ePQMgc/efg7HPWZbMimKdks9pUmz6wITWc+PxLb 9edE3yqUNiJ9C32GntZ2NvL9kjD8yJMhAD/nKFPqxZkyuFY3uys0//vMOvztAcFmoCy/FPVjerJ dprwfHLuAnct7R0Ba+uC/VBsd1CFVD2w8esfWb5j7AEMY+x7/ClhMq3qXH8JdQJFRUEDG67jKsc woBnA2rBHCsR/Q3z8aKdWEPYQh+UI40lqs5aNmYwAUV7nMgfEpYFXNOrmXfAEhQYzo8PHp+jq+K Xw+2+brrCK2E7jz7cAXASv8wZkT4d/ajV/3/a5Pm7mX7ZGGcyB2mHEUg020MjhB+uIQVjjmTH4W 7UrquQu5ijjf9Z3xYqz+frOOzviG6atXU6YlerwxnO9kRNqTxeqPOu/LSpYdlUPooemCe5ii5Ld wK6eDT7uCxV5KXFFcYLF4XS41TYlPO3or+VqRQKO/dOUBGq/f0hjwHhDe6J1TehH6yyhJ4gngGA cGAiEi4O+ZrRoCqhulmEZjYbqQhJtmpP1+Q8GNYvwa6MCmcwdQj+5Cz/0xGqQ6allB5kSptIt5K 63bjrrkruo1TYOO8IiY15iTzeinJX6c7zb4uZuhW0xEFT4Uc53KsPc2ifezOlPEKEJO3fGaIcNC yXSn7YpY3G6yBEQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 If a delegation has been closed or revoked (sc_status is set), the NFS4ERR_DELAY retry loop in nfsd4_cb_notify_done will spin indefinitely. This holds the sc_count reference and prevents the delegation from being freed. Add a check for sc_status at the top of the function, matching the pattern used in nfsd4_cb_recall_done, to terminate the callback promptly when the delegation is no longer valid. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index acddd55a99d8..5e391f01d753 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3593,6 +3593,9 @@ nfsd4_cb_notify_done(struct nfsd4_callback *cb, struct nfsd4_cb_notify *ncn =3D container_of(cb, struct nfsd4_cb_notify, = ncn_cb); struct nfs4_delegation *dp =3D container_of(ncn, struct nfs4_delegation, = dl_cb_notify); =20 + if (dp->dl_stid.sc_status) + return 1; + switch (task->tk_status) { case -NFS4ERR_DELAY: rpc_delay(task, 2 * HZ); --=20 2.54.0 From nobody Sun May 24 18:41:29 2026 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 9A952311968; Sat, 23 May 2026 16:17:44 +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=1779553065; cv=none; b=eQBIgNaZvroxfwZzpSVejyJi+9kyvAnPmWoD6vyaD18LxjCyFKSE7gmtDnikkK0EWhDitU6JsXC3TrZThTrd+eBs8AfcS/LK7cjXv+XRzqSCeTXH1FKCMs8D+e+NupzB+chb08WBSkjv2D4lb/PHYSiEBRWUQhIl7TJcC1jUzGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779553065; c=relaxed/simple; bh=X4x/AvCaoMxutTY6MD1BKDmSKvURH2w1AeSQB5QH6EQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AfRS1w8Kx8xlTDaWU3FBuxUlBapDedQzqnV0CmbXaKYHuyisI/Sov/RuzBUFjYLPN/ZS2S2M3ybONe7ptDDjOhuJ8lm0B1hClVX59me/7tMeoUggXeI46aWcQr7NxSYQmTMtEQ6LJiGUdFuPqyiI3IGS9fQYXEx49ChTcinrB6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zt3lXbsH; 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="Zt3lXbsH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFEDA1F00A3C; Sat, 23 May 2026 16:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779553064; bh=sxess6041C7VID601A6ElDmI3D6gxpgyrdXxL4Gizk8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Zt3lXbsHkR4fuPNM04dgjQvcqoTpH9A/aDEfwux8d5DwMhUNHbo27aHSXDY7L9Ore xvjfoeuVf5qB7WrNioZlCMAl23pKji0q9wA+mPT57UeMcvaX6HeZvwDgaU5zcQ3pzX nb32BisoK3JQmhADY8+12FCRHbEEEbdrl9NU1kQdILJa38BfL+LufQTzZAd4TG2yBB HuLpBH71Bvhes6jxfvSJquPQXnBY9MvQl2zcC5rJ/dgZbe7ufTlKuOay7QqR7Vfm1E S9OHuRzvvkcS5j3yK66MhErdZ/d0Uru5jPUcVv/4Wr46YkjXUFp3q0v0tljz0N0Bw7 nRwg+ZWb/MwlA== From: Jeff Layton Date: Sat, 23 May 2026 12:17:37 -0400 Subject: [PATCH 4/4] nfsd: fix ino_t format specifier in nfsd_handle_dir_event tracepoint 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: quoted-printable Message-Id: <20260523-dir-deleg-fixes-v1-4-142c884f85ce@kernel.org> References: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> In-Reply-To: <20260523-dir-deleg-fixes-v1-0-142c884f85ce@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=984; i=jlayton@kernel.org; h=from:subject:message-id; bh=X4x/AvCaoMxutTY6MD1BKDmSKvURH2w1AeSQB5QH6EQ=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqEdMj/vsy5EVxJNkdE5X6F/kRFBvpw7Ng8DKq7 RaLE4BClwiJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahHTIwAKCRAADmhBGVaC FZoeD/9Fsm6r6QJAyZOe6TZnbmKYlVWNRi8SKiIkMtb+iYDGsT3FRdJIspnp0IRQVSJFlrepv7i BcFlzrDB0qT5ikyiBaL7YL/amToPDPS7f8OadLfjkZis7Pce0wOq2yI41EsvmvdFj2w5miCUszg io7xXHaZpsCj3+1YA45o2hlvVqgg/47YyQWSDtdcfaVPRo51wHNKNN+6xZ39HVmFWiL7aSD4oVu 3hEJo88dXZX7g+H/empZfm2+WqFZ/Dil2cBDKAK7qyysjMSnhzziPgOnlwAjmf2loBYvDLIllkI aj64ZRa+8HTxGx1NzFGylors0+pND162mYUdjOlMGk9+sC6kA79GN6MzPDs7gbRCceUHzhl/LAw rLtWe7cXGRkRg6gHUuYIZlf6pqy2pm1YgWmz8yxCdPv4A8XGa7W3qX/xQ6P6DfxE+OfUgHkJiRx 9ZzzcCpT1rkLFKw95bqSjJo4Fgyqpo1siyDD+3QDWz29/WYlBN374OyEYjNLEAjVWuYtLf9ql4P JLPjhaQX4P9MCxCXJOedRAo+Lfcl/kCEDhE4652aqjZZkZ8JDRqThKHU2P/8BvjV+cQzxJJZ4dF qSJjbwGl3YY00C1pGy+BYby+5xQK5KG0MP2NrbQxNYfGp3QalcYa5HUNeCRgvY7oD+t4LhFGuBX qcEwwfYJ7zo4kVQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 inode->i_ino is now a u64. Use the same size for the tracepoint. Signed-off-by: Jeff Layton --- fs/nfsd/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 3d0f0bd30d90..1d5d11f914f2 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1384,7 +1384,7 @@ TRACE_EVENT(nfsd_handle_dir_event, TP_STRUCT__entry( __field(u32, mask) __field(dev_t, s_dev) - __field(ino_t, i_ino) + __field(ino_t, u64) __string_len(name, name ? name->name : NULL, name ? name->len : 0) ), @@ -1394,7 +1394,7 @@ TRACE_EVENT(nfsd_handle_dir_event, __entry->i_ino =3D dir ? dir->i_ino : 0; __assign_str(name); ), - TP_printk("inode=3D0x%x:0x%x:0x%lx mask=3D%s name=3D%s", + TP_printk("inode=3D0x%x:0x%x:0x%llx mask=3D%s name=3D%s", MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, show_fsnotify_mask(__entry->mask), __get_str(name)) --=20 2.54.0