From owner-svn-src-head@FreeBSD.ORG  Wed Apr  3 11:30:18 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 BF04430C;
 Wed,  3 Apr 2013 11:30:18 +0000 (UTC) (envelope-from mav@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 B21277D5;
 Wed,  3 Apr 2013 11:30:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33BUIhs005686;
 Wed, 3 Apr 2013 11:30:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33BUI6P005685;
 Wed, 3 Apr 2013 11:30:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304031130.r33BUI6P005685@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 3 Apr 2013 11:30:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249048 - in head/sys/cam: ata scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Apr 2013 11:30:18 -0000

Author: mav
Date: Wed Apr  3 11:30:18 2013
New Revision: 249048
URL: http://svnweb.freebsd.org/changeset/base/249048

Log:
  Add xpt_release_ccb()'s missed at r248872.  That made `shutdown -p` stuck
  on controller with small number of queue slots and several disks connected.

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Wed Apr  3 11:06:26 2013	(r249047)
+++ head/sys/cam/ata/ata_da.c	Wed Apr  3 11:30:18 2013	(r249048)
@@ -1886,6 +1886,7 @@ adaflush(void)
 		    softc->disk->d_devstat);
 		if (error != 0)
 			xpt_print(periph->path, "Synchronize cache failed\n");
+		xpt_release_ccb(ccb);
 		cam_periph_unlock(periph);
 	}
 }
@@ -1931,6 +1932,7 @@ adaspindown(uint8_t cmd, int flags)
 		    softc->disk->d_devstat);
 		if (error != 0)
 			xpt_print(periph->path, "Spin-down disk failed\n");
+		xpt_release_ccb(ccb);
 		cam_periph_unlock(periph);
 	}
 }

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Wed Apr  3 11:06:26 2013	(r249047)
+++ head/sys/cam/scsi/scsi_da.c	Wed Apr  3 11:30:18 2013	(r249048)
@@ -2897,6 +2897,7 @@ dashutdown(void * arg, int howto)
 		    softc->disk->d_devstat);
 		if (error != 0)
 			xpt_print(periph->path, "Synchronize cache failed\n");
+		xpt_release_ccb(ccb);
 		cam_periph_unlock(periph);
 	}
 }