From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:06:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6614916A468; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D17C16A400 for ; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1CC3A13C45D for ; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SB6E26039791 for ; Thu, 28 Jun 2007 11:06:14 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SB6E3A039788 for perforce@freebsd.org; Thu, 28 Jun 2007 11:06:14 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:06:14 GMT Message-Id: <200706281106.l5SB6E3A039788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=122474 Change 122474 by rdivacky@rdivacky_witten on 2007/06/28 11:05:43 dir_vn -> dvp Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#35 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#35 (text+ko) ==== @@ -85,7 +85,7 @@ static int setfflags(struct thread *td, struct vnode *, int); static int setutimes(struct thread *td, struct vnode *, const struct timespec *, int, int); -static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); +static int kern_get_at(struct thread *td, int dirfd, struct vnode **dvpp); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); static int kern_absolute_path(const char *path, enum uio_seg pathseg); @@ -978,21 +978,21 @@ } static int -kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn) +kern_get_at(struct thread *td, int dirfd, struct vnode **dvpp) { int error; if (dirfd == AT_FDCWD) - *dir_vn = NULL; + *dvpp = NULL; else { - error = fgetvp(td, dirfd, dir_vn); + error = fgetvp(td, dirfd, dvpp); if (error) { - *dir_vn = NULL; + *dvpp = NULL; return (error); } - if ((*dir_vn)->v_type != VDIR) { - vrele(*dir_vn); - *dir_vn = NULL; + if ((*dvpp)->v_type != VDIR) { + vrele(*dvpp); + *dvpp = NULL; return (ENOTDIR); } } @@ -1021,7 +1021,7 @@ int flags, int mode) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -1038,12 +1038,12 @@ AUDIT_ARG(mode, mode); /* XXX: audit dirfd */ - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + MPSAFE, pathseg, path, td, dvp); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1156,15 +1156,15 @@ td->td_retval[0] = indx; return (0); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); bad: VFS_UNLOCK_GIANT(vfslocked); fdclose(fdp, fp, indx, td); fdrop(fp, td); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -1240,7 +1240,7 @@ kern_mknodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int mode, int dev) { - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; struct mount *mp; struct vattr vattr; int error; @@ -1268,17 +1268,17 @@ if (error) return (error); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -1291,8 +1291,8 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } else { VATTR_NULL(&vattr); @@ -1325,8 +1325,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1347,8 +1347,8 @@ vput(nd.ni_vp); } } - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); vn_finished_write(mp); @@ -1405,21 +1405,21 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn = NULL; + struct vnode *dvp = NULL; AUDIT_ARG(mode, mode); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -1431,8 +1431,8 @@ vput(nd.ni_dvp); vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { @@ -1440,8 +1440,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1464,8 +1464,8 @@ #ifdef MAC out: #endif - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); vput(nd.ni_dvp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -1571,25 +1571,25 @@ { struct nameidata ndp, ndl; int error; - struct vnode *pdir_vn, *ldir_vn; + struct vnode *pdvp, *ldvp; struct vnode *vp; struct mount *mp; int vfslocked; int lvfslocked; - error = kern_get_at(td, fd1, &pdir_vn); + error = kern_get_at(td, fd1, &pdvp); if (error && !kern_absolute_path(path1, segflg)) return (error); NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE | - AUDITVNODE1, segflg, path1, td, pdir_vn); + AUDITVNODE1, segflg, path1, td, pdvp); - error = kern_get_at(td, fd2, &ldir_vn); + error = kern_get_at(td, fd2, &ldvp); if (error && !kern_absolute_path(path2, segflg)) return (error); NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp); bwillwrite(); if ((error = namei(&ndp)) != 0) @@ -1640,10 +1640,10 @@ VFS_UNLOCK_GIANT(vfslocked); out: - if (pdir_vn) - vrele(pdir_vn); - if (ldir_vn) - vrele(ldir_vn); + if (pdvp) + vrele(pdvp); + if (ldvp) + vrele(ldvp); return (error); } @@ -1698,7 +1698,7 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn = NULL; + struct vnode *dvp = NULL; if (segflg == UIO_SYSSPACE) { syspath = __DECONST(char *, path1); @@ -1709,14 +1709,14 @@ } AUDIT_ARG(text, syspath); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path2, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, dvp); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -1762,8 +1762,8 @@ vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); if (segflg != UIO_SYSSPACE) uma_zfree(namei_zone, syspath); return (error); @@ -1871,23 +1871,23 @@ kern_unlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; int error; struct nameidata nd; int vfslocked; restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error == EINVAL ? EPERM : error); } vfslocked = NDHASGIANT(&nd); @@ -1914,8 +1914,8 @@ VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1935,8 +1935,8 @@ } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); if (vp == nd.ni_dvp) vrele(vp); else @@ -2149,17 +2149,17 @@ { int error; struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct ucred *cred, *tmpcred; struct vnode *vp; int vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF | - MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); /* * Create and modify a temporary credential instead of one that @@ -2188,8 +2188,8 @@ out: td->td_ucred = cred; crfree(tmpcred); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2381,16 +2381,16 @@ struct stat *sbp) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct stat sb; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED | - LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2408,8 +2408,8 @@ error = 0; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2450,17 +2450,17 @@ struct stat *sbp) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct vnode *vp; struct stat sb; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | - LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2475,8 +2475,8 @@ *sbp = sb; error = 0; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2657,18 +2657,18 @@ char *buf, enum uio_seg bufseg, int count) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct vnode *vp; struct iovec aiov; struct uio auio; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | - MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2701,8 +2701,8 @@ VFS_UNLOCK_GIANT(vfslocked); td->td_retval[0] = count - auio.uio_resid; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2930,15 +2930,15 @@ mode_t mode) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2948,8 +2948,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2981,15 +2981,15 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn; + struct vnode *dvp; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); AUDIT_ARG(mode, mode); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, - path, td, dir_vn); + path, td, dvp); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3120,15 +3120,15 @@ int uid, int gid) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -3138,8 +3138,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3178,15 +3178,15 @@ int uid, int gid) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -3196,8 +3196,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3362,16 +3362,16 @@ const struct timeval *tptr, enum uio_seg tptrseg) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct timespec ts[2]; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + MPSAFE, pathseg, path, td, dvp); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3383,8 +3383,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3759,30 +3759,30 @@ const char *new, enum uio_seg pathseg) { struct nameidata fromnd, tond; - struct vnode *fdir_vn, *tdir_vn; + struct vnode *frdvp, *todvp; struct mount *mp = NULL; struct vnode *tvp, *fvp, *tdvp; int tvfslocked; int fvfslocked; int error; - error = kern_get_at(td, oldfd, &fdir_vn); + error = kern_get_at(td, oldfd, &frdvp); if (error && !kern_absolute_path(old, pathseg)) return (error); - error = kern_get_at(td, newfd, &tdir_vn); + error = kern_get_at(td, newfd, &todvp); if (error && !kern_absolute_path(new, pathseg)) return (error); #ifdef MAC NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); + LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, frdvp); #else NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | - SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); + SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, frdvp); #endif NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, - pathseg, new, td, tdir_vn); + pathseg, new, td, todvp); bwillwrite(); if ((error = namei(&fromnd)) != 0) @@ -3877,10 +3877,10 @@ if (error == -1) return (0); out2: - if (fdir_vn) - vrele(fdir_vn); - if (tdir_vn) - vrele(tdir_vn); + if (frdvp) + vrele(frdvp); + if (todvp) + vrele(todvp); return (error); } @@ -3930,7 +3930,7 @@ int mode) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; struct vattr vattr; int error; struct nameidata nd; @@ -3938,18 +3938,18 @@ AUDIT_ARG(mode, mode); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dvp); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -3967,8 +3967,8 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { @@ -3976,8 +3976,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -3998,8 +3998,8 @@ #ifdef MAC out: #endif - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (!error) @@ -4038,18 +4038,18 @@ kern_rmdirat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; int error; struct nameidata nd; int vfslocked; restart: - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd);