Module Name: src
Committed By: bouyer
Date: Sun Feb 14 13:27:45 UTC 2010
Modified Files:
src/sys/kern [netbsd-5]: vfs_syscalls.c
src/sys/nfs [netbsd-5]: nfs_serv.c
src/sys/sys [netbsd-5]: namei.src
Log Message:
Pull up following revision(s) (requested by pooka in ticket #1289):
sys/sys/namei.src: revision 1.14
sys/kern/vfs_syscalls.c: revision 1.401
sys/nfs/nfs_serv.c: revision 1.149
sys/sys/namei.h: regen
Define namei flag INRENAME and set it if a lookup operation is part
of rename. This helps with building better asserts for rename in
the DELETE lookup ... the RENAME lookup is quite obviously a part
of rename.
To generate a diff of this commit:
cvs rdiff -u -r1.376.4.4 -r1.376.4.5 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.138.16.1 -r1.138.16.2 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.8.14.1 -r1.8.14.2 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.376.4.4 src/sys/kern/vfs_syscalls.c:1.376.4.5
--- src/sys/kern/vfs_syscalls.c:1.376.4.4 Mon Dec 21 09:19:16 2009
+++ src/sys/kern/vfs_syscalls.c Sun Feb 14 13:27:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.376.4.4 2009/12/21 09:19:16 sborrill Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.376.4.5 2010/02/14 13:27:45 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.376.4.4 2009/12/21 09:19:16 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.376.4.5 2010/02/14 13:27:45 bouyer Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_43.h"
@@ -3317,7 +3317,7 @@
uint32_t saveflag;
int error;
- NDINIT(&fromnd, DELETE, LOCKPARENT | SAVESTART | TRYEMULROOT,
+ NDINIT(&fromnd, DELETE, LOCKPARENT | SAVESTART | TRYEMULROOT | INRENAME,
seg, from);
if ((error = namei(&fromnd)) != 0)
return (error);
@@ -3382,7 +3382,7 @@
NDINIT(&tond, RENAME,
LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | TRYEMULROOT
- | (fvp->v_type == VDIR ? CREATEDIR : 0),
+ | INRENAME | (fvp->v_type == VDIR ? CREATEDIR : 0),
seg, to);
if ((error = namei(&tond)) != 0) {
VFS_RENAMELOCK_EXIT(fs);
Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.138.16.1 src/sys/nfs/nfs_serv.c:1.138.16.2
--- src/sys/nfs/nfs_serv.c:1.138.16.1 Mon Apr 13 21:06:50 2009
+++ src/sys/nfs/nfs_serv.c Sun Feb 14 13:27:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.138.16.1 2009/04/13 21:06:50 snj Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.138.16.2 2010/02/14 13:27:45 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.138.16.1 2009/04/13 21:06:50 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.138.16.2 2010/02/14 13:27:45 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1859,7 +1859,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;
+ fromnd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART | INRENAME;
error = nfs_namei(&fromnd, &fnsfh, len, slp, nam, &md,
&dpos, &fdirp, lwp, (nfsd->nd_flag & ND_KERBAUTH), false);
if (fdirp && v3) {
@@ -1930,7 +1930,8 @@
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;
+ tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE |
+ SAVESTART | 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.8.14.1 src/sys/sys/namei.src:1.8.14.2
--- src/sys/sys/namei.src:1.8.14.1 Wed Dec 10 21:26:56 2008
+++ src/sys/sys/namei.src Sun Feb 14 13:27:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: namei.src,v 1.8.14.1 2008/12/10 21:26:56 snj Exp $ */
+/* $NetBSD: namei.src,v 1.8.14.2 2010/02/14 13:27:45 bouyer Exp $ */
/*
* Copyright (c) 1985, 1989, 1991, 1993
@@ -136,7 +136,8 @@
NAMEIFL DOWHITEOUT 0x0040000 /* do whiteouts */
NAMEIFL REQUIREDIR 0x0080000 /* must be a directory */
NAMEIFL CREATEDIR 0x0200000 /* trailing slashes are ok */
-NAMEIFL PARAMASK 0x02fff00 /* mask of parameter descriptors */
+NAMEIFL INRENAME 0x0400000 /* operation is a part of ``rename'' */
+NAMEIFL PARAMASK 0x06fff00 /* mask of parameter descriptors */
/*
* Initialization of an nameidata structure.
