Attachment 239948 Details for Bug 268971 – Fix done_namei so it is only set when nd_repstat is set after nfsvno_namei

[patch] Fix done_namei so it is only set when nd_repstat is set after nfsvno_namei

donamei.patch (text/plain), 1.24 KB, created by Rick Macklem on 2023-02-06 15:14:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2023-02-06 15:14:29 UTC

Size: 1.24 KB

patch

obsolete

>--- sys/fs/nfsserver/nfs_nfsdserv.c.donamei	2023-02-06 06:49:02.671540000 -0800
>+++ sys/fs/nfsserver/nfs_nfsdserv.c	2023-02-06 06:41:29.059072000 -0800
>@@ -3040,18 +3040,15 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int is
> 			NFSEXITCODE2(error, nd);
> 			return (error);
> 		}
>-		if (!nd->nd_repstat) {
>+		if (!nd->nd_repstat)
> 			nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp,
> 			    &dirp);
>-			done_namei = true;
>-		} else {
>+		else
> 			vrele(dp);
>-			nfsvno_relpathbuf(&named);
>-		}
> 		if (create == NFSV4OPEN_CREATE) {
> 		    switch (how) {
> 		    case NFSCREATE_UNCHECKED:
>-			if (done_namei && named.ni_vp != NULL) {
>+			if (named.ni_vp) {
> 				/*
> 				 * Clear the setable attribute bits, except
> 				 * for Size, if it is being truncated.
>@@ -3063,13 +3060,14 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int is
> 			}
> 			break;
> 		    case NFSCREATE_GUARDED:
>-			if (done_namei && named.ni_vp != NULL &&
>-			    nd->nd_repstat == 0)
>+			if (named.ni_vp && !nd->nd_repstat) {
> 				nd->nd_repstat = EEXIST;
>+				done_namei = true;
>+			}
> 			break;
> 		    case NFSCREATE_EXCLUSIVE:
> 			exclusive_flag = 1;
>-			if (done_namei && named.ni_vp == NULL)
>+			if (!named.ni_vp)
> 				nva.na_mode = 0;
> 			break;
> 		    case NFSCREATE_EXCLUSIVE41:

Actions: View | Diff

Attachments on bug 268971: 239485 | 239922 | 239938 | 239948 | 239962