diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 2efb7eacd02..069783e6bf9 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.40 2001/12/10 02:19:34 art Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.41 2001/12/11 09:32:46 art Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -749,7 +749,7 @@ mountnfs(argp, mp, nam, pth, hst) */ mp->mnt_stat.f_iosize = NFS_MAXDGRAMDATA; mp->mnt_fs_bshift = DEV_BSHIFT; - mp->mnt_dev_bshift = -1; + mp->mnt_dev_bshift = DEV_BSHIFT; return (0); bad: @@ -858,7 +858,7 @@ loop: */ if (vp->v_mount != mp) goto loop; - if (waitfor == MNT_LAZY || VOP_ISLOCKED(vp) || + if (waitfor == MNT_LAZY || (LIST_EMPTY(&vp->v_dirtyblkhd) && vp->v_uobj.uo_npages == 0)) continue; diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index ee9fc5bc4be..1af7a6bd1d4 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.43 2001/12/10 04:45:31 art Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.44 2001/12/11 09:32:46 art Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -2589,7 +2589,7 @@ nfs_bmap(v) daddr_t *a_bnp; int *a_runp; } */ *ap = v; - register struct vnode *vp = ap->a_vp; + struct vnode *vp = ap->a_vp; if (ap->a_vpp != NULL) *ap->a_vpp = vp; |