Re: kern/57691: NFS client regression with macOS 14 server

[Jason Thorpe <thorpej%me.com@localhost>]

> On Dec 8, 2023, at 7:30 PM, Amitai Schleier <schmonz%schmonz.com@localhost> wrote:
> 
> Thank you for looking into this and giving me something to try. Neither 
> of the following diffs seems to make a difference, though (tested on my 
> 10.0_RC1/aarch64 NFS client). Have I misunderstood something?
> 
> 
> Index: nfs/nfs_vnops.c
> ===================================================================
> RCS file: /cvsroot/src/sys/nfs/nfs_vnops.c,v
> retrieving revision 1.324
> diff -u -p -r1.324 nfs_vnops.c
> --- nfs/nfs_vnops.c 24 May 2022 06:28:02 -0000 1.324
> +++ nfs/nfs_vnops.c 9 Dec 2023 03:23:02 -0000
> @@ -2632,8 +2632,13 @@ nfs_readdirplusrpc(struct vnode *vp, str
>    txdr_cookie3(uiop->uio_offset, tl);
>    }
>    tl += 2;
> - *tl++ = dnp->n_cookieverf.nfsuquad[0];
> - *tl++ = dnp->n_cookieverf.nfsuquad[1];
> + if (uiop->uio_offset == 0) {
> + *tl++ = 0;
> + *tl++ = 0;
> + } else {
> + *tl++ = dnp->n_cookieverf.nfsuquad[0];
> + *tl++ = dnp->n_cookieverf.nfsuquad[1];
> + }
>    *tl++ = txdr_unsigned(nmp->nm_readdirsize);
>    *tl = txdr_unsigned(nmp->nm_rsize);
>    nfsm_request(dnp, NFSPROC_READDIRPLUS, curlwp, cred);

Ok, this is the correct variation of the change, but you missed a spot… there’s also a similar bit of code for the READDIR RPC.  Add the same snippet there and try again (just look for “cookieverf”).

-- thorpej