Attachment 241943 Details for Bug 271174 – Fix the NFSv3 server so that it returns all 64bits of fileno for Readdir entries

[patch] Fix the NFSv3 server so that it returns all 64bits of fileno for Readdir entries

dfileno.patch (text/plain), 1023 bytes, created by Rick Macklem on 2023-05-03 02:03:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2023-05-03 02:03:43 UTC

Size: 1023 bytes

patch

obsolete

>--- sys/fs/nfsserver/nfs_nfsdport.c.fileno	2023-05-02 18:02:09.933943000 -0700
>+++ sys/fs/nfsserver/nfs_nfsdport.c	2023-05-02 18:04:54.131410000 -0700
>@@ -2251,12 +2251,12 @@ again:
> 			if (nd->nd_flag & ND_NFSV3) {
> 				NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
> 				*tl++ = newnfs_true;
>-				*tl++ = 0;
>+				txdr_hyper(dp->d_fileno, tl);
> 			} else {
> 				NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
> 				*tl++ = newnfs_true;
>+				*tl = txdr_unsigned(dp->d_fileno);
> 			}
>-			*tl = txdr_unsigned(dp->d_fileno);
> 			(void) nfsm_strtom(nd, dp->d_name, nlen);
> 			if (nd->nd_flag & ND_NFSV3) {
> 				NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
>@@ -2753,8 +2753,7 @@ again:
> 			if (nd->nd_flag & ND_NFSV3) {
> 				NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
> 				*tl++ = newnfs_true;
>-				*tl++ = 0;
>-				*tl = txdr_unsigned(dp->d_fileno);
>+				txdr_hyper(dp->d_fileno, tl);
> 				dirlen += nfsm_strtom(nd, dp->d_name, nlen);
> 				NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
> 				txdr_hyper(*cookiep, tl);

Actions: View | Diff

Attachments on bug 271174: 241943