From owner-svn-src-all@FreeBSD.ORG  Thu Dec  4 17:36:30 2014
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C7B8CA78;
 Thu,  4 Dec 2014 17:36:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B42CB945;
 Thu,  4 Dec 2014 17:36:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB4HaU0r041099;
 Thu, 4 Dec 2014 17:36:30 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB4HaUiv041098;
 Thu, 4 Dec 2014 17:36:30 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201412041736.sB4HaUiv041098@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 4 Dec 2014 17:36:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275478 - head/sys/cam/ctl
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.18-1
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: Thu, 04 Dec 2014 17:36:30 -0000

Author: mav
Date: Thu Dec  4 17:36:29 2014
New Revision: 275478
URL: https://svnweb.freebsd.org/changeset/base/275478

Log:
  Swap resource count scopes for used/available space.
  
  Used count should be reported as per-LUN, while available should not.
  
  MFC after:	1 week

Modified:
  head/sys/cam/ctl/ctl.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Thu Dec  4 17:26:04 2014	(r275477)
+++ head/sys/cam/ctl/ctl.c	Thu Dec  4 17:36:29 2014	(r275478)
@@ -6956,7 +6956,7 @@ ctl_lbp_log_sense_handler(struct ctl_scs
 		phdr->param_len = 8;
 		data = (uint8_t *)(phdr + 1);
 		scsi_ulto4b(val >> CTL_LBP_EXPONENT, data);
-		data[4] = 0x01; /* per-LUN */
+		data[4] = 0x02; /* per-pool */
 		data += phdr->param_len;
 	}
 
@@ -6969,7 +6969,7 @@ ctl_lbp_log_sense_handler(struct ctl_scs
 		phdr->param_len = 8;
 		data = (uint8_t *)(phdr + 1);
 		scsi_ulto4b(val >> CTL_LBP_EXPONENT, data);
-		data[4] = 0x02; /* per-pool */
+		data[4] = 0x01; /* per-LUN */
 		data += phdr->param_len;
 	}