From owner-svn-src-projects@FreeBSD.ORG Mon Apr 1 16:26:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7484FFF6; Mon, 1 Apr 2013 16:26:21 +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 4EED712E; Mon, 1 Apr 2013 16:26:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31GQLIQ029460; Mon, 1 Apr 2013 16:26:21 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31GQKeI029458; Mon, 1 Apr 2013 16:26:20 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201304011626.r31GQKeI029458@svn.freebsd.org> From: Alexander Motin Date: Mon, 1 Apr 2013 16:26:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248978 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 16:26:21 -0000 Author: mav Date: Mon Apr 1 16:26:20 2013 New Revision: 248978 URL: http://svnweb.freebsd.org/changeset/base/248978 Log: Remove cam_ccbq_frozen(), that is trivial after removing multilevel freeze at r248918. Modified: projects/camlock/sys/cam/cam_queue.h projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_queue.h ============================================================================== --- projects/camlock/sys/cam/cam_queue.h Mon Apr 1 16:23:34 2013 (r248977) +++ projects/camlock/sys/cam/cam_queue.h Mon Apr 1 16:26:20 2013 (r248978) @@ -243,12 +243,5 @@ cam_ccbq_release_opening(struct cam_ccbq ccbq->devq_openings++; } -static __inline u_int32_t -cam_ccbq_frozen(struct cam_ccbq *ccbq) -{ - - return (ccbq->queue.qfrozen_cnt); -} - #endif /* _KERNEL */ #endif /* _CAM_CAM_QUEUE_H */ Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Mon Apr 1 16:23:34 2013 (r248977) +++ projects/camlock/sys/cam/cam_xpt.c Mon Apr 1 16:26:20 2013 (r248978) @@ -306,7 +306,7 @@ xpt_schedule_dev_sendq(struct cam_eb *bu if ((dev->ccbq.queue.entries > 0) && (dev->ccbq.dev_openings > 0) && - (cam_ccbq_frozen(&dev->ccbq) == 0)) { + (dev->ccbq.queue.qfrozen_cnt == 0)) { /* * The priority of a device waiting for controller * resources is that of the highest priority CCB @@ -3156,7 +3156,7 @@ xpt_run_dev_allocq(struct cam_ed *device while ((drvq->entries > 0) && (device->ccbq.devq_openings > 0 || CAMQ_GET_PRIO(drvq) <= CAM_PRIORITY_OOB) && - (cam_ccbq_frozen(&device->ccbq) == 0)) { + (device->ccbq.queue.qfrozen_cnt == 0)) { union ccb *work_ccb; struct cam_periph *drv; @@ -4156,9 +4156,7 @@ xpt_release_devq_device(struct cam_ed *d count = dev->ccbq.queue.qfrozen_cnt; } dev->ccbq.queue.qfrozen_cnt -= count; - if (cam_ccbq_frozen(&dev->ccbq) == 0) - xpt_run_dev_allocq(dev); - if (cam_ccbq_frozen(&dev->ccbq) == 0) { + if (dev->ccbq.queue.qfrozen_cnt == 0) { /* * No longer need to wait for a successful * command completion. @@ -4172,6 +4170,7 @@ xpt_release_devq_device(struct cam_ed *d callout_stop(&dev->callout); dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING; } + xpt_run_dev_allocq(dev); if (run_queue == 0) return; /*