v_blockh is split into clean and dirty lists

SCCS-vsn: sys/nfs/nfs_vnops.c 7.22
SCCS-vsn: sys/nfs/nfs_node.c 7.18

diff --git a/usr/src/sys/nfs/nfs_node.c b/usr/src/sys/nfs/nfs_node.c
index 16a9535..ef4a76d 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.17 (Berkeley) %G%
+ *     @(#)nfs_node.c  7.18 (Berkeley) %G%

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


@@ -213,11 +213,9 @@ nfs_reclaim(vp)
         * Flush out any bio buffer or cmap references
         */
        if (vp->v_type == VREG) {
         * Flush out any bio buffer or cmap references
         */
        if (vp->v_type == VREG) {

-               if (vp->v_blockh) {
-                       nfs_lock(vp);
-                       vinvalbuf(vp, TRUE);
-                       nfs_unlock(vp);
-               }
+               nfs_lock(vp);
+               vinvalbuf(vp, TRUE);
+               nfs_unlock(vp);

                if (np->n_flag & NPAGEDON)
                        mpurge(vp);
        }
                if (np->n_flag & NPAGEDON)
                        mpurge(vp);
        }

diff --git a/usr/src/sys/nfs/nfs_vnops.c b/usr/src/sys/nfs/nfs_vnops.c
index 621706f..8aad016 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.21 (Berkeley) %G%
+ *     @(#)nfs_vnops.c 7.22 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -273,7 +273,7 @@ nfs_close(vp, fflags, cred)
        register struct nfsnode *np = VTONFS(vp);
        int error = 0;
 
        register struct nfsnode *np = VTONFS(vp);
        int error = 0;
 

-       if (vp->v_type == VREG && vp->v_blockh && ((np->n_flag & NMODIFIED) ||
+       if (vp->v_type == VREG && ((np->n_flag & NMODIFIED) ||

           ((np->n_flag & NBUFFERED) && np->n_sillyrename))) {
                nfs_lock(vp);
                np->n_flag &= ~(NMODIFIED|NBUFFERED);
           ((np->n_flag & NBUFFERED) && np->n_sillyrename))) {
                nfs_lock(vp);
                np->n_flag &= ~(NMODIFIED|NBUFFERED);


@@ -352,8 +352,7 @@ nfs_setattr(vp, vap, cred)
                np = VTONFS(vp);
                if (np->n_flag & NMODIFIED) {
                        np->n_flag &= ~NMODIFIED;
                np = VTONFS(vp);
                if (np->n_flag & NMODIFIED) {
                        np->n_flag &= ~NMODIFIED;

-                       if (vp->v_blockh)
-                               vinvalbuf(vp, TRUE);
+                       vinvalbuf(vp, TRUE);

                }
        }
        sp->sa_atime.tv_sec = txdr_unsigned(vap->va_atime.tv_sec);
                }
        }
        sp->sa_atime.tv_sec = txdr_unsigned(vap->va_atime.tv_sec);


@@ -736,8 +735,7 @@ nfs_remove(ndp)
        if (vp->v_type == VREG) {
                if (np->n_flag & (NMODIFIED|NBUFFERED)) {
                        np->n_flag &= ~(NMODIFIED|NBUFFERED);
        if (vp->v_type == VREG) {
                if (np->n_flag & (NMODIFIED|NBUFFERED)) {
                        np->n_flag &= ~(NMODIFIED|NBUFFERED);

-                       if (vp->v_blockh)
-                               vinvalbuf(vp, TRUE);
+                       vinvalbuf(vp, TRUE);

                }
                if (np->n_flag & NPAGEDON) {
                        np->n_flag &= ~NPAGEDON;
                }
                if (np->n_flag & NPAGEDON) {
                        np->n_flag &= ~NPAGEDON;