--- src/sys/vfs/coda/Attic/coda_vfsops.c 2004/10/12 19:20:50 1.17 +++ src/sys/vfs/coda/Attic/coda_vfsops.c 2004/11/12 00:09:28 1.18 @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include @@ -123,7 +123,7 @@ coda_mount(struct mount *vfsp, /* Alloca ViceFid rootfid; ViceFid ctlfid; int error; - struct nameidata nd; + struct nlookupdata nd; ENTRY; @@ -137,10 +137,13 @@ coda_mount(struct mount *vfsp, /* Alloca } /* Validate mount device. Similar to getmdev(). */ - NDINIT(&nd, NAMEI_LOOKUP, CNP_FOLLOW, UIO_USERSPACE, data, td); - error = namei(&nd); - dvp = nd.ni_vp; - + dvp = NULL; + error = nlookup_init(&nd, data, UIO_USERSPACE, NLC_FOLLOW); + if (error == 0) + error = nlookup(&nd); + if (error == 0) + error = cache_vref(nd.nl_ncp, nd.nl_cred, &dvp); + nlookup_done(&nd); if (error) { MARK_INT_FAIL(CODA_MOUNT_STATS); return (error); @@ -148,12 +151,10 @@ coda_mount(struct mount *vfsp, /* Alloca if (dvp->v_type != VCHR) { MARK_INT_FAIL(CODA_MOUNT_STATS); vrele(dvp); - NDFREE(&nd, NDF_ONLY_PNBUF); return(ENXIO); } udev = dvp->v_udev; vrele(dvp); - NDFREE(&nd, NDF_ONLY_PNBUF); #if 0 /* YYY huh? what paranoia is this? */ /*