]> git.hungrycats.org Git - linux/commitdiff
pNFS: Fix CB_NOTIFY_DEVICEID CHANGE to consume ndc_immediate
authorBenjamin Coddington <ben.coddington@hammerspace.com>
Tue, 15 Sep 2026 12:22:06 +0000 (08:22 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:05 +0000 (12:06 -0500)
commit a0cb76dc3b2919af8257fc08b4f9a79a35442483 upstream.

decode_devicenotify_args() gated the trailing ndc_immediate on
cbd_layout_type rather than cbd_notify_type, so the flag was never
consumed and a multi-item cnda_changes<> misaligned after the first
entry.

Fixes: 1be5683b03a7 ("pnfs: CB_NOTIFY_DEVICEID")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Benjamin Coddington <bcodding@hammerspace.com>
Signed-off-by: Anna Schumaker <anna.schumaker@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/callback_xdr.c

index ada04a7230c223472cbc577bf911520137e19fd7..1aa6a6e14b0574e87d052edb4e4cb99ad15ff526 100644 (file)
@@ -316,7 +316,7 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp,
                memcpy(dev->cbd_dev_id.data, p, NFS4_DEVICEID4_SIZE);
                p += XDR_QUADLEN(NFS4_DEVICEID4_SIZE);
 
-               if (dev->cbd_layout_type == NOTIFY_DEVICEID4_CHANGE) {
+               if (dev->cbd_notify_type == NOTIFY_DEVICEID4_CHANGE) {
                        p = xdr_inline_decode(xdr, sizeof(uint32_t));
                        if (unlikely(p == NULL)) {
                                status = htonl(NFS4ERR_BADXDR);