From owner-svn-src-all@FreeBSD.ORG  Tue Mar 26 18:01:25 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 03A2D521;
 Tue, 26 Mar 2013 18:01:25 +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 EA8E8113;
 Tue, 26 Mar 2013 18:01:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QI1OO9053843;
 Tue, 26 Mar 2013 18:01:24 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QI1O7m053842;
 Tue, 26 Mar 2013 18:01:24 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201303261801.r2QI1O7m053842@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Tue, 26 Mar 2013 18:01:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248729 - 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:01:25 -0000

Author: jimharris
Date: Tue Mar 26 18:01:24 2013
New Revision: 248729
URL: http://svnweb.freebsd.org/changeset/base/248729

Log:
  Do not look at the namespace's thin provisioning field to determine if DSM
  command is supported.  The two are not related.
  
  Sponsored by:	Intel

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

Modified: head/sys/dev/nvme/nvme_ns.c
==============================================================================
--- head/sys/dev/nvme/nvme_ns.c	Tue Mar 26 17:30:40 2013	(r248728)
+++ head/sys/dev/nvme/nvme_ns.c	Tue Mar 26 18:01:24 2013	(r248729)
@@ -339,7 +339,7 @@ nvme_ns_construct(struct nvme_namespace 
 	}
 #endif
 
-	if (ctrlr->cdata.oncs.dsm && ns->data.nsfeat.thin_prov)
+	if (ctrlr->cdata.oncs.dsm)
 		ns->flags |= NVME_NS_DEALLOCATE_SUPPORTED;
 
 	if (ctrlr->cdata.vwc.present)