Module Name: src
Committed By: dholland
Date: Sun Jan 2 05:12:34 UTC 2011
Modified Files:
src/sys/kern: vfs_syscalls.c
src/sys/nfs: nfs_serv.c
src/sys/sys: namei.src
Log Message:
Remove remaining references to SAVESTART.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.413 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.154 -r1.155 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.20 -r1.21 src/sys/sys/namei.src
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.412 src/sys/kern/vfs_syscalls.c:1.413
--- src/sys/kern/vfs_syscalls.c:1.412 Sun Jan 2 05:09:31 2011
+++ src/sys/kern/vfs_syscalls.c Sun Jan 2 05:12:33 2011
@@ -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 @@
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 @@
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) {
Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.154 src/sys/nfs/nfs_serv.c:1.155
--- src/sys/nfs/nfs_serv.c:1.154 Sun Jan 2 05:09:31 2011
+++ src/sys/nfs/nfs_serv.c Sun Jan 2 05:12:34 2011
@@ -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 @@
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 @@
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 @@
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) {
Index: src/sys/sys/namei.src
diff -u src/sys/sys/namei.src:1.20 src/sys/sys/namei.src:1.21
--- src/sys/sys/namei.src:1.20 Sun Jan 2 05:09:30 2011
+++ src/sys/sys/namei.src Sun Jan 2 05:12:33 2011
@@ -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 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 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.
