From owner-svn-src-projects@FreeBSD.ORG  Sun Feb  3 23:35:54 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5FA0B5D8;
 Sun,  3 Feb 2013 23:35:54 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 52DEAF34;
 Sun,  3 Feb 2013 23:35:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r13NZsQY088217;
 Sun, 3 Feb 2013 23:35:54 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r13NZsYb088216;
 Sun, 3 Feb 2013 23:35:54 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201302032335.r13NZsYb088216@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Sun, 3 Feb 2013 23:35:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246307 - projects/virtio/sys/dev/virtio/block
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Feb 2013 23:35:54 -0000

Author: bryanv
Date: Sun Feb  3 23:35:53 2013
New Revision: 246307
URL: http://svnweb.freebsd.org/changeset/base/246307

Log:
  virtio_blk: Correct stripe offset calculation
  
  Pointed out by:	max
  Approved by:	grehan (implicit)

Modified:
  projects/virtio/sys/dev/virtio/block/virtio_blk.c

Modified: projects/virtio/sys/dev/virtio/block/virtio_blk.c
==============================================================================
--- projects/virtio/sys/dev/virtio/block/virtio_blk.c	Sun Feb  3 23:35:05 2013	(r246306)
+++ projects/virtio/sys/dev/virtio/block/virtio_blk.c	Sun Feb  3 23:35:53 2013	(r246307)
@@ -725,8 +725,9 @@ vtblk_alloc_disk(struct vtblk_softc *sc,
 	if (virtio_with_feature(dev, VIRTIO_BLK_F_TOPOLOGY)) {
 		dp->d_stripesize = dp->d_sectorsize *
 		    (1 << blkcfg->topology.physical_block_exp);
-		dp->d_stripeoffset = dp->d_sectorsize *
-		    blkcfg->topology.alignment_offset;
+		dp->d_stripeoffset = (dp->d_stripesize -
+		    blkcfg->topology.alignment_offset * dp->d_sectorsize) %
+		    dp->d_stripesize;
 	}
 
 	if (vtblk_write_cache_enabled(sc, blkcfg) != 0)