svn commit: r206752 - stable/7/sys/kern

[Andriy Gapon]

Author: avg
Date: Sat Apr 17 11:12:20 2010
New Revision: 206752
URL: http://svn.freebsd.org/changeset/base/206752

Log:
  MFC r205860,206097: correctly set b_offset for getblk(devvp)

Modified:
  stable/7/sys/kern/vfs_bio.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Sat Apr 17 11:06:42 2010	(r206751)
+++ stable/7/sys/kern/vfs_bio.c	Sat Apr 17 11:12:20 2010	(r206752)
@@ -2698,7 +2698,7 @@ loop:
 		 */
 		if (flags & GB_NOCREAT)
 			return NULL;
-		bsize = bo->bo_bsize;
+		bsize = vn_isdisk(vp, NULL) ? DEV_BSIZE : bo->bo_bsize;
 		offset = blkno * bsize;
 		vmio = vp->v_object != NULL;
 		maxsize = vmio ? size + (offset & PAGE_MASK) : size;