From owner-svn-src-stable-10@FreeBSD.ORG Thu Dec 11 00:25:26 2014 Return-Path: Delivered-To: svn-src-stable-10@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 CA7A45FB; Thu, 11 Dec 2014 00:25:26 +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 B6735C70; Thu, 11 Dec 2014 00:25:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBB0PQml019962; Thu, 11 Dec 2014 00:25:26 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBB0PQJZ019961; Thu, 11 Dec 2014 00:25:26 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201412110025.sBB0PQJZ019961@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 11 Dec 2014 00:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275694 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 00:25:26 -0000 Author: mav Date: Thu Dec 11 00:25:26 2014 New Revision: 275694 URL: https://svnweb.freebsd.org/changeset/base/275694 Log: MFC r275478: Swap resource count scopes for used/available space. Used count should be reported as per-LUN, while available should not. Modified: stable/10/sys/cam/ctl/ctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Wed Dec 10 23:30:18 2014 (r275693) +++ stable/10/sys/cam/ctl/ctl.c Thu Dec 11 00:25:26 2014 (r275694) @@ -7153,7 +7153,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; } @@ -7166,7 +7166,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; }