have to grab information before the vnode is released

SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.66
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.66

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 938f376..5a5baf1 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.65 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.66 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1123,6 +1123,7 @@ ufs_rmdir(ndp, p)
 
        ip = VTOI(ndp->ni_vp);
        dp = VTOI(ndp->ni_dvp);
 
        ip = VTOI(ndp->ni_vp);
        dp = VTOI(ndp->ni_dvp);

+       ump = VFSTOUFS(ndp->ni_dvp->v_mount);

        /*
         * No rmdir "." please.
         */
        /*
         * No rmdir "." please.
         */


@@ -1168,7 +1169,6 @@ ufs_rmdir(ndp, p)
         * worry about them later.
         */
        ip->i_nlink -= 2;
         * worry about them later.
         */
        ip->i_nlink -= 2;

-       ump = VFSTOUFS(ndp->ni_dvp->v_mount);

        error = (ump->um_itrunc)(ip, (u_long)0, IO_SYNC);
        cache_purge(ITOV(ip));
 out:
        error = (ump->um_itrunc)(ip, (u_long)0, IO_SYNC);
        cache_purge(ITOV(ip));
 out:

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 938f376..5a5baf1 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.65 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.66 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1123,6 +1123,7 @@ ufs_rmdir(ndp, p)
 
        ip = VTOI(ndp->ni_vp);
        dp = VTOI(ndp->ni_dvp);
 
        ip = VTOI(ndp->ni_vp);
        dp = VTOI(ndp->ni_dvp);

+       ump = VFSTOUFS(ndp->ni_dvp->v_mount);

        /*
         * No rmdir "." please.
         */
        /*
         * No rmdir "." please.
         */


@@ -1168,7 +1169,6 @@ ufs_rmdir(ndp, p)
         * worry about them later.
         */
        ip->i_nlink -= 2;
         * worry about them later.
         */
        ip->i_nlink -= 2;

-       ump = VFSTOUFS(ndp->ni_dvp->v_mount);

        error = (ump->um_itrunc)(ip, (u_long)0, IO_SYNC);
        cache_purge(ITOV(ip));
 out:
        error = (ump->um_itrunc)(ip, (u_long)0, IO_SYNC);
        cache_purge(ITOV(ip));
 out: