now use b_lblkno in place of b_blkno

SCCS-vsn: sys/nfs/nfs_bio.c 7.7

diff --git a/usr/src/sys/nfs/nfs_bio.c b/usr/src/sys/nfs/nfs_bio.c
index 5e29ef3..51debb1 100644 (file)
--- a/usr/src/sys/nfs/nfs_bio.c
+++ b/usr/src/sys/nfs/nfs_bio.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_bio.c   7.6 (Berkeley) %G%
+ *     @(#)nfs_bio.c   7.7 (Berkeley) %G%

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


@@ -270,8 +270,8 @@ loop:
                        if (ep->b_vp != vp || (ep->b_flags & B_INVAL))
                                continue;
                        /* look for overlap */
                        if (ep->b_vp != vp || (ep->b_flags & B_INVAL))
                                continue;
                        /* look for overlap */

-                       if (ep->b_bcount == 0 || ep->b_blkno > ecurblk ||
-                           ep->b_blkno + btodb(ep->b_bcount) <= curblk)
+                       if (ep->b_bcount == 0 || ep->b_lblkno > ecurblk ||
+                           ep->b_lblkno + btodb(ep->b_bcount) <= curblk)

                                continue;
                        s = splbio();
                        if (ep->b_flags&B_BUSY) {
                                continue;
                        s = splbio();
                        if (ep->b_flags&B_BUSY) {