From owner-svn-src-all@FreeBSD.ORG  Tue Mar 26 18:16:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 340CBB4E;
 Tue, 26 Mar 2013 18:16:31 +0000 (UTC)
 (envelope-from jimharris@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 26D572C1;
 Tue, 26 Mar 2013 18:16:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QIGVKZ058037;
 Tue, 26 Mar 2013 18:16:31 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QIGV68058036;
 Tue, 26 Mar 2013 18:16:31 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201303261816.r2QIGV68058036@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Tue, 26 Mar 2013 18:16:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248730 - head/sys/dev/nvme
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Mar 2013 18:16:31 -0000

Author: jimharris
Date: Tue Mar 26 18:16:30 2013
New Revision: 248730
URL: http://svnweb.freebsd.org/changeset/base/248730

Log:
  Make the DSM range count 0-based.  Previously we were deallocating one more
  LBA than we should have been.
  
  Sponsored by:	Intel

Modified:
  head/sys/dev/nvme/nvme_ns_cmd.c

Modified: head/sys/dev/nvme/nvme_ns_cmd.c
==============================================================================
--- head/sys/dev/nvme/nvme_ns_cmd.c	Tue Mar 26 18:01:24 2013	(r248729)
+++ head/sys/dev/nvme/nvme_ns_cmd.c	Tue Mar 26 18:16:30 2013	(r248730)
@@ -96,7 +96,7 @@ nvme_ns_cmd_deallocate(struct nvme_names
 	cmd->nsid = ns->id;
 
 	/* TODO: create a delete command data structure */
-	cmd->cdw10 = num_ranges;
+	cmd->cdw10 = num_ranges - 1;
 	cmd->cdw11 = NVME_DSM_ATTR_DEALLOCATE;
 
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);