get rid of unneeded namei

SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 7.59
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.59
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.59
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.59

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index c2aa999..492d1f5 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vnops.c 7.58 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.59 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -1193,7 +1193,6 @@ ufs_mkdir(ndp, vap)
        struct nameidata *ndp;
        struct vattr *vap;
 {
        struct nameidata *ndp;
        struct vattr *vap;
 {

-       struct proc *p = curproc;               /* XXX */

        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;
        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;


@@ -1276,15 +1275,8 @@ ufs_mkdir(ndp, vap)
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {

-               ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-               ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
-               error = namei(ndp, p);
-               if (!error) {
-                       iput(dp);
-                       dp = VTOI(ndp->ni_vp);
-                       dp->i_nlink--;
-                       dp->i_flag |= ICHG;
-               }
+               dp->i_nlink--;
+               dp->i_flag |= ICHG;

        }
 bad:
        /*
        }
 bad:
        /*

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 9f535ba..414868c 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.58 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.59 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -1193,7 +1193,6 @@ ufs_mkdir(ndp, vap)
        struct nameidata *ndp;
        struct vattr *vap;
 {
        struct nameidata *ndp;
        struct vattr *vap;
 {

-       struct proc *p = curproc;               /* XXX */

        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;
        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;


@@ -1276,15 +1275,8 @@ ufs_mkdir(ndp, vap)
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {

-               ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-               ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
-               error = namei(ndp, p);
-               if (!error) {
-                       iput(dp);
-                       dp = VTOI(ndp->ni_vp);
-                       dp->i_nlink--;
-                       dp->i_flag |= ICHG;
-               }
+               dp->i_nlink--;
+               dp->i_flag |= ICHG;

        }
 bad:
        /*
        }
 bad:
        /*

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index e50d7a6..fc45c08 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vnops.c 7.58 (Berkeley) %G%
+ *     @(#)lfs_vnops.c 7.59 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -1193,7 +1193,6 @@ ufs_mkdir(ndp, vap)
        struct nameidata *ndp;
        struct vattr *vap;
 {
        struct nameidata *ndp;
        struct vattr *vap;
 {

-       struct proc *p = curproc;               /* XXX */

        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;
        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;


@@ -1276,15 +1275,8 @@ ufs_mkdir(ndp, vap)
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {

-               ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-               ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
-               error = namei(ndp, p);
-               if (!error) {
-                       iput(dp);
-                       dp = VTOI(ndp->ni_vp);
-                       dp->i_nlink--;
-                       dp->i_flag |= ICHG;
-               }
+               dp->i_nlink--;
+               dp->i_flag |= ICHG;

        }
 bad:
        /*
        }
 bad:
        /*

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 9f535ba..414868c 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.58 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.59 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -1193,7 +1193,6 @@ ufs_mkdir(ndp, vap)
        struct nameidata *ndp;
        struct vattr *vap;
 {
        struct nameidata *ndp;
        struct vattr *vap;
 {

-       struct proc *p = curproc;               /* XXX */

        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;
        register struct inode *ip, *dp;
        struct inode *tip;
        struct vnode *dvp;


@@ -1276,15 +1275,8 @@ ufs_mkdir(ndp, vap)
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {
         * the parent directory.
         */
        if (error = direnter(ip, ndp)) {

-               ndp->ni_nameiop &= ~(MODMASK | OPMASK);
-               ndp->ni_nameiop |= LOOKUP | LOCKLEAF | NOCACHE;
-               error = namei(ndp, p);
-               if (!error) {
-                       iput(dp);
-                       dp = VTOI(ndp->ni_vp);
-                       dp->i_nlink--;
-                       dp->i_flag |= ICHG;
-               }
+               dp->i_nlink--;
+               dp->i_flag |= ICHG;

        }
 bad:
        /*
        }
 bad:
        /*