Module Name: src
Committed By: dholland
Date: Mon Apr 18 00:40:54 UTC 2011
Modified Files:
src/sys/kern: vfs_lookup.c
src/sys/sys: namei.src
Log Message:
ISSYMLINK is now only referenced inside vfs_lookup.c, and not needed
there, so get rid of it.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.22 -r1.23 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_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.175 src/sys/kern/vfs_lookup.c:1.176
--- src/sys/kern/vfs_lookup.c:1.175 Thu Apr 14 15:29:25 2011
+++ src/sys/kern/vfs_lookup.c Mon Apr 18 00:40:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.175 2011/04/14 15:29:25 yamt Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.176 2011/04/18 00:40:53 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.175 2011/04/14 15:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.176 2011/04/18 00:40:53 dholland Exp $");
#include "opt_magiclinks.h"
@@ -226,7 +226,7 @@
*
* System-call-layer level code that is going to call namei should
* first create a pathbuf and adjust all the bells and whistles on it
- * as needed by context
+ * as needed by context.
*/
struct pathbuf {
@@ -318,7 +318,7 @@
/*
* XXX should not exist:
- * 1. whether a pointer is kernel or user should be statically checkable
+ * 1. whether a pointer is kernel or user should be statically checkable.
* 2. copyin should be handled by the upper part of the syscall layer,
* not in here.
*/
@@ -1118,8 +1118,6 @@
* (currently, this may consume more than one)
*/
- cnp->cn_flags &= ~ISSYMLINK;
-
dirloop:
/*
* If we have a leading string of slashes, remove
@@ -1203,7 +1201,6 @@
if (namei_atsymlink(state, foundobj)) {
ndp->ni_pathlen += state->slashes;
ndp->ni_next -= state->slashes;
- cnp->cn_flags |= ISSYMLINK;
if (neverfollow) {
error = EINVAL;
} else {
@@ -1513,7 +1510,6 @@
state->docache = 1;
state->rdonly = cnp->cn_flags & RDONLY;
ndp->ni_dvp = NULL;
- cnp->cn_flags &= ~ISSYMLINK;
cnp->cn_consume = 0;
cp = NULL;
@@ -1617,7 +1613,6 @@
* Setup: break out flag bits into variables.
*/
rdonly = cnp->cn_flags & RDONLY;
- cnp->cn_flags &= ~ISSYMLINK;
/*
* Search a new directory.
Index: src/sys/sys/namei.src
diff -u src/sys/sys/namei.src:1.22 src/sys/sys/namei.src:1.23
--- src/sys/sys/namei.src:1.22 Fri Jan 7 11:25:10 2011
+++ src/sys/sys/namei.src Mon Apr 18 00:40:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: namei.src,v 1.22 2011/01/07 11:25:10 pooka Exp $ */
+/* $NetBSD: namei.src,v 1.23 2011/04/18 00:40:54 dholland Exp $ */
/*
* Copyright (c) 1985, 1989, 1991, 1993
@@ -154,14 +154,13 @@
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 */
-NAMEIFL ISSYMLINK 0x0010000 /* symlink needs interpretation */
NAMEIFL ISWHITEOUT 0x0020000 /* found whiteout */
NAMEIFL DOWHITEOUT 0x0040000 /* do whiteouts */
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 0x0efe300 /* mask of parameter descriptors */
+NAMEIFL PARAMASK 0x0eee300 /* mask of parameter descriptors */
/*
* Initialization of an nameidata structure.
