reassign instead of invalidating buffers associated with other vnodes

when doing vinvalbuf (fix for itrunc from noemi@osf.org)

SCCS-vsn: sys/kern/vfs_bio.c 7.21
SCCS-vsn: sys/kern/vfs_cluster.c 7.21

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index eea22b0..822b05e 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -14,7 +14,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.
  *

- *     @(#)vfs_bio.c   7.20 (Berkeley) %G%
+ *     @(#)vfs_bio.c   7.21 (Berkeley) %G%

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


@@ -700,7 +700,10 @@ vinvalbuf(vp, save)
                                (void) bwrite(bp);
                                break;
                        }
                                (void) bwrite(bp);
                                break;
                        }

-                       bp->b_flags |= B_INVAL;
+                       if (bp->b_vp != vp)
+                               reassignbuf(bp, bp->b_vp);
+                       else
+                               bp->b_flags |= B_INVAL;

                        brelse(bp);
                }
        }
                        brelse(bp);
                }
        }

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index be0f6c0..b6ac975 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -14,7 +14,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.
  *

- *     @(#)vfs_cluster.c       7.20 (Berkeley) %G%
+ *     @(#)vfs_cluster.c       7.21 (Berkeley) %G%

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


@@ -700,7 +700,10 @@ vinvalbuf(vp, save)
                                (void) bwrite(bp);
                                break;
                        }
                                (void) bwrite(bp);
                                break;
                        }

-                       bp->b_flags |= B_INVAL;
+                       if (bp->b_vp != vp)
+                               reassignbuf(bp, bp->b_vp);
+                       else
+                               bp->b_flags |= B_INVAL;

                        brelse(bp);
                }
        }
                        brelse(bp);
                }
        }