From owner-svn-src-releng@FreeBSD.ORG  Tue Oct  7 10:36:07 2014
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B1243DEB;
 Tue,  7 Oct 2014 10:36:07 +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 8E550A4E;
 Tue,  7 Oct 2014 10:36:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97Aa7BA001877;
 Tue, 7 Oct 2014 10:36:07 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97Aa7Cd001876;
 Tue, 7 Oct 2014 10:36:07 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201410071036.s97Aa7Cd001876@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: Tue, 7 Oct 2014 10:36:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r272684 - releng/10.1/sys/cam/ctl
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 10:36:07 -0000

Author: mav
Date: Tue Oct  7 10:36:06 2014
New Revision: 272684
URL: https://svnweb.freebsd.org/changeset/base/272684

Log:
  MFC r272224:  Fix page length reported for Block Limits VPD page.
  
  Approved by:	re (marius)

Modified:
  releng/10.1/sys/cam/ctl/ctl.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/cam/ctl/ctl.c
==============================================================================
--- releng/10.1/sys/cam/ctl/ctl.c	Tue Oct  7 10:04:25 2014	(r272683)
+++ releng/10.1/sys/cam/ctl/ctl.c	Tue Oct  7 10:36:06 2014	(r272684)
@@ -10173,7 +10173,7 @@ ctl_inquiry_evpd_block_limits(struct ctl
 		bl_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
 
 	bl_ptr->page_code = SVPD_BLOCK_LIMITS;
-	scsi_ulto2b(sizeof(*bl_ptr), bl_ptr->page_length);
+	scsi_ulto2b(sizeof(*bl_ptr) - 4, bl_ptr->page_length);
 	bl_ptr->max_cmp_write_len = 0xff;
 	scsi_ulto4b(0xffffffff, bl_ptr->max_txfer_len);
 	if (lun != NULL) {