svn commit: r281977 - stable/9/sys/dev/virtio/block

[Alexander Motin]

Author: mav
Date: Sat Apr 25 06:50:15 2015
New Revision: 281977
URL: https://svnweb.freebsd.org/changeset/base/281977

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

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

Modified: stable/9/sys/dev/virtio/block/virtio_blk.c
==============================================================================
--- stable/9/sys/dev/virtio/block/virtio_blk.c	Sat Apr 25 06:49:18 2015	(r281976)
+++ stable/9/sys/dev/virtio/block/virtio_blk.c	Sat Apr 25 06:50:15 2015	(r281977)
@@ -728,7 +728,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 -