vfs: move cn_nameptr assignment out of namei_getpath

This commit is contained in:
Mateusz Guzik 2022-09-17 00:59:32 +00:00
parent 41a0a99f85
commit 3df3d88cc5

View File

@ -420,11 +420,7 @@ namei_getpath(struct nameidata *ndp)
&ndp->ni_pathlen);
}
if (__predict_false(error != 0))
return (error);
cnp->cn_nameptr = cnp->cn_pnbuf;
return (0);
return (error);
}
static int
@ -622,6 +618,8 @@ namei(struct nameidata *ndp)
return (error);
}
cnp->cn_nameptr = cnp->cn_pnbuf;
#ifdef KTRACE
if (KTRPOINT(td, KTR_NAMEI)) {
ktrnamei(cnp->cn_pnbuf);
@ -654,6 +652,7 @@ namei(struct nameidata *ndp)
namei_cleanup_cnp(cnp);
return (error);
}
cnp->cn_nameptr = cnp->cn_pnbuf;
/* FALLTHROUGH */
case CACHE_FPL_STATUS_ABORTED:
TAILQ_INIT(&ndp->ni_cap_tracker);