svn commit: r281976 - stable/10/sys/dev/virtio/block

[Alexander Motin]

Author: mav
Date: Sat Apr 25 06:49:18 2015
New Revision: 281976
URL: https://svnweb.freebsd.org/changeset/base/281976

Log:
  MFC r281698:
  Do not report stripe size if it is equal to sector size.

Modified:
  stable/10/sys/dev/virtio/block/virtio_blk.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/virtio/block/virtio_blk.c
==============================================================================
--- stable/10/sys/dev/virtio/block/virtio_blk.c	Sat Apr 25 06:07:19 2015	(r281975)
+++ stable/10/sys/dev/virtio/block/virtio_blk.c	Sat Apr 25 06:49:18 2015	(r281976)
@@ -712,7 +712,8 @@ vtblk_alloc_disk(struct vtblk_softc *sc,
 		dp->d_fwheads = blkcfg->geometry.heads;
 	}
 
-	if (virtio_with_feature(dev, VIRTIO_BLK_F_TOPOLOGY)) {
+	if (virtio_with_feature(dev, VIRTIO_BLK_F_TOPOLOGY) &&
+	    blkcfg->topology.physical_block_exp > 0) {
 		dp->d_stripesize = dp->d_sectorsize *
 		    (1 << blkcfg->topology.physical_block_exp);
 		dp->d_stripeoffset = (dp->d_stripesize -