Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Apr 2013 18:09:08 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r249481 - head/sys/cam
Message-ID:  <201304141809.r3EI986E075403@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Sun Apr 14 18:09:08 2013
New Revision: 249481
URL: http://svnweb.freebsd.org/changeset/base/249481

Log:
  Remove some more pieces of multilevel freeze mechanism, missed in r249466.

Modified:
  head/sys/cam/cam_queue.h

Modified: head/sys/cam/cam_queue.h
==============================================================================
--- head/sys/cam/cam_queue.h	Sun Apr 14 17:08:34 2013	(r249480)
+++ head/sys/cam/cam_queue.h	Sun Apr 14 18:09:08 2013	(r249481)
@@ -155,10 +155,10 @@ cam_ccbq_pending_ccb_count(struct cam_cc
 static __inline void
 cam_ccbq_take_opening(struct cam_ccbq *ccbq);
 
-static __inline int
+static __inline void
 cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb);
 
-static __inline int
+static __inline void
 cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb);
 
 static __inline union ccb *
@@ -187,29 +187,17 @@ cam_ccbq_take_opening(struct cam_ccbq *c
 	ccbq->held++;
 }
 
-static __inline int
+static __inline void
 cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb)
 {
 	ccbq->held--;
 	camq_insert(&ccbq->queue, &new_ccb->ccb_h.pinfo);
-	if (ccbq->queue.qfrozen_cnt > 0) {
-		ccbq->devq_openings++;
-		ccbq->held++;
-		return (1);
-	} else
-		return (0);
 }
 
-static __inline int
+static __inline void
 cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb)
 {
 	camq_remove(&ccbq->queue, ccb->ccb_h.pinfo.index);
-	if (ccbq->queue.qfrozen_cnt > 0) {
-		ccbq->devq_openings--;
-		ccbq->held--;
-		return (1);
-	} else
-		return (0);
 }
 
 static __inline union ccb *



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304141809.r3EI986E075403>