Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove remaining references to SAVESTART.

This commit is contained in:
dholland 2011-01-02 05:12:33 +00:00
parent 42bae07fce
commit 6d2ff39e83
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/vfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls.c,v 1.412 2011/01/02 05:09:31 dholland Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.413 2011/01/02 05:12:33 dholland Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.412 2011/01/02 05:09:31 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.413 2011/01/02 05:12:33 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@ -3450,7 +3450,7 @@ do_sys_rename(const char *from, const char *to, enum uio_seg seg, int retain)
return error;
}
NDINIT(&fromnd, DELETE, LOCKPARENT | SAVESTART | TRYEMULROOT | INRENAME,
NDINIT(&fromnd, DELETE, LOCKPARENT | TRYEMULROOT | INRENAME,
frompb);
if ((error = namei(&fromnd)) != 0) {
pathbuf_destroy(frompb);
@ -3511,7 +3511,7 @@ do_sys_rename(const char *from, const char *to, enum uio_seg seg, int retain)
fvp = fromnd.ni_vp;
NDINIT(&tond, RENAME,
LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | TRYEMULROOT
LOCKPARENT | LOCKLEAF | NOCACHE | TRYEMULROOT
| INRENAME | (fvp->v_type == VDIR ? CREATEDIR : 0),
topb);
if ((error = namei(&tond)) != 0) {

11
sys/nfs/nfs_serv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.154 2011/01/02 05:09:31 dholland Exp $ */
/* $NetBSD: nfs_serv.c,v 1.155 2011/01/02 05:12:34 dholland Exp $ */
/*
* Copyright (c) 1989, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.154 2011/01/02 05:09:31 dholland Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.155 2011/01/02 05:12:34 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -412,7 +412,7 @@ nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
nd.ni_cnd.cn_cred = cred;
nd.ni_cnd.cn_nameiop = LOOKUP;
nd.ni_cnd.cn_flags = LOCKLEAF | SAVESTART;
nd.ni_cnd.cn_flags = LOCKLEAF;
error = nfs_namei(&nd, &nsfh, len, slp, nam, &md, &dpos,
&dirp, lwp, (nfsd->nd_flag & ND_KERBAUTH), pubflag);
@ -1913,7 +1913,7 @@ nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
saved_uid = kauth_cred_geteuid(cred);
fromnd.ni_cnd.cn_cred = cred;
fromnd.ni_cnd.cn_nameiop = DELETE;
fromnd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART | INRENAME;
fromnd.ni_cnd.cn_flags = LOCKPARENT | INRENAME;
error = nfs_namei(&fromnd, &fnsfh, len, slp, nam, &md,
&dpos, &fdirp, lwp, (nfsd->nd_flag & ND_KERBAUTH), false);
if (fdirp && v3) {
@ -1982,8 +1982,7 @@ nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct lwp *l
kauth_cred_seteuid(cred, saved_uid);
tond.ni_cnd.cn_cred = cred;
tond.ni_cnd.cn_nameiop = RENAME;
tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE |
SAVESTART | INRENAME;
tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE | INRENAME;
error = nfs_namei(&tond, &tnsfh, len2, slp, nam, &md,
&dpos, &tdirp, lwp, (nfsd->nd_flag & ND_KERBAUTH), false);
if (tdirp && v3) {

10
sys/sys/namei.src
View File

@ -1,4 +1,4 @@
/* $NetBSD: namei.src,v 1.20 2011/01/02 05:09:30 dholland Exp $ */
/* $NetBSD: namei.src,v 1.21 2011/01/02 05:12:33 dholland Exp $ */
/*
* Copyright (c) 1985, 1989, 1991, 1993
@ -148,15 +148,9 @@ NAMEIFL NOCHROOT 0x01000000 /* no chroot on abs path lookups */
NAMEIFL MODMASK 0x010000fc /* mask of operational modifiers */
/*
* Namei parameter descriptors.
*
* SAVESTART is set only by the callers of namei. It implies saving
* the parent directory that contains the name in ni_startdir. It
* allows repeated calls to lookup for the name being sought. The
* caller is responsible for vrele'ing ni_startdir.
*/
NAMEIFL NOCROSSMOUNT 0x0000100 /* do not cross mount points */
NAMEIFL RDONLY 0x0000200 /* lookup with read-only semantics */
NAMEIFL SAVESTART 0x0001000 /* save starting directory */
NAMEIFL ISDOTDOT 0x0002000 /* current component name is .. */
NAMEIFL MAKEENTRY 0x0004000 /* entry is to be added to name cache */
NAMEIFL ISLASTCN 0x0008000 /* this is last component of pathname */
@ -167,7 +161,7 @@ NAMEIFL REQUIREDIR 0x0080000 /* must be a directory */
NAMEIFL CREATEDIR 0x0200000 /* trailing slashes are ok */
NAMEIFL INRENAME 0x0400000 /* operation is a part of ``rename'' */
NAMEIFL INRELOOKUP 0x0800000 /* set while inside relookup() */
NAMEIFL PARAMASK 0x0efff00 /* mask of parameter descriptors */
NAMEIFL PARAMASK 0x0efef00 /* mask of parameter descriptors */
/*
* Initialization of an nameidata structure.