v_count => v_usecount

SCCS-vsn: sys/nfs/nfs_vnops.c 7.20
SCCS-vsn: sys/nfs/nfs_node.c 7.17

diff --git a/usr/src/sys/nfs/nfs_node.c b/usr/src/sys/nfs/nfs_node.c
index da53d75..16a9535 100644 (file)
--- a/usr/src/sys/nfs/nfs_node.c
+++ b/usr/src/sys/nfs/nfs_node.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)nfs_node.c  7.16 (Berkeley) %G%
+ *     @(#)nfs_node.c  7.17 (Berkeley) %G%

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


@@ -157,7 +157,7 @@ nfs_inactive(vp)
        extern int prtactive;
 
        np = VTONFS(vp);
        extern int prtactive;
 
        np = VTONFS(vp);

-       if (prtactive && vp->v_count != 0)
+       if (prtactive && vp->v_usecount != 0)

                vprint("nfs_inactive: pushing active", vp);
        nfs_lock(vp);
        sp = np->n_sillyrename;
                vprint("nfs_inactive: pushing active", vp);
        nfs_lock(vp);
        sp = np->n_sillyrename;


@@ -221,7 +221,7 @@ nfs_reclaim(vp)
                if (np->n_flag & NPAGEDON)
                        mpurge(vp);
        }
                if (np->n_flag & NPAGEDON)
                        mpurge(vp);
        }

-       if (prtactive && vp->v_count != 0)
+       if (prtactive && vp->v_usecount != 0)

                vprint("nfs_reclaim: pushing active", vp);
        /*
         * Remove the nfsnode from its hash chain.
                vprint("nfs_reclaim: pushing active", vp);
        /*
         * Remove the nfsnode from its hash chain.

diff --git a/usr/src/sys/nfs/nfs_vnops.c b/usr/src/sys/nfs/nfs_vnops.c
index 2506078..b08214b 100644 (file)
--- a/usr/src/sys/nfs/nfs_vnops.c
+++ b/usr/src/sys/nfs/nfs_vnops.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)nfs_vnops.c 7.19 (Berkeley) %G%
+ *     @(#)nfs_vnops.c 7.20 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -714,7 +714,7 @@ nfs_create(ndp, vap)
  *       mpurge the vnode to flush out cmap references
  *       (This is necessary to update the vnode ref cnt as well as sensible
  *        for actual removes, to free up the buffers)
  *       mpurge the vnode to flush out cmap references
  *       (This is necessary to update the vnode ref cnt as well as sensible
  *        for actual removes, to free up the buffers)

- * 2 - If v_count > 1
+ * 2 - If v_usecount > 1

  *       If a rename is not already in the works
  *          call nfs_sillyrename() to set it up
  *     else
  *       If a rename is not already in the works
  *          call nfs_sillyrename() to set it up
  *     else


@@ -744,7 +744,7 @@ nfs_remove(ndp)
                        mpurge(vp);     /* In case cmap entries still ref it */
                }
        }
                        mpurge(vp);     /* In case cmap entries still ref it */
                }
        }

-       if (vp->v_count > 1) {
+       if (vp->v_usecount > 1) {

                if (!np->n_sillyrename)
                        error = nfs_sillyrename(ndp, REMOVE);
        } else {
                if (!np->n_sillyrename)
                        error = nfs_sillyrename(ndp, REMOVE);
        } else {