diff options
author | phk <phk@FreeBSD.org> | 2004-07-04 19:42:25 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-07-04 19:42:25 +0000 |
commit | 59c88fd71a233093e6ea7e8afb491fd5803ae5a7 (patch) | |
tree | ac390c200c8b5622c25bb00aa3a8331fe28fa7bf | |
parent | 7662db4aa1781530b9ac3f043b3602cbf141b788 (diff) | |
download | FreeBSD-src-59c88fd71a233093e6ea7e8afb491fd5803ae5a7.zip FreeBSD-src-59c88fd71a233093e6ea7e8afb491fd5803ae5a7.tar.gz |
Make the last commit handle non-phk root devices better.
-rw-r--r-- | sys/kern/vfs_bio.c | 1 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 6050c07..ba939fe 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2573,6 +2573,7 @@ loop: if (vp->v_bsize != bsize) { printf("WARNING: Wrong block size on vnode: %d should be %d\n", vp->v_bsize, bsize); vprint("Please email phk@FreeBSD.org this info\n", vp); + vp->v_bsize = bsize; } offset = blkno * bsize; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a1cfdaa..7e56575 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -839,9 +839,10 @@ getnewvnode(tag, mp, vops, vpp) mac_associate_vnode_singlelabel(mp, vp); #endif delmntque(vp); - if (mp != NULL) + if (mp != NULL) { insmntque(vp, mp); - vp->v_bsize = mp->mnt_stat.f_iosize; + vp->v_bsize = mp->mnt_stat.f_iosize; + } return (0); } |