From owner-freebsd-bugs@FreeBSD.ORG Thu Feb 27 21:50:01 2014 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9011AAE9 for ; Thu, 27 Feb 2014 21:50:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 601471978 for ; Thu, 27 Feb 2014 21:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1RLo1E2028473 for ; Thu, 27 Feb 2014 21:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1RLo183028472; Thu, 27 Feb 2014 21:50:01 GMT (envelope-from gnats) Date: Thu, 27 Feb 2014 21:50:01 GMT Message-Id: <201402272150.s1RLo183028472@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: dfilter@FreeBSD.ORG (dfilter service) Subject: Re: kern/174684: commit references a PR X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: dfilter service List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 21:50:01 -0000 The following reply was made to PR kern/174684; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: kern/174684: commit references a PR Date: Thu, 27 Feb 2014 21:42:06 +0000 (UTC) Author: delphij Date: Thu Feb 27 21:41:52 2014 New Revision: 262572 URL: http://svnweb.freebsd.org/changeset/base/262572 Log: Get rid of the 'chan' from softc structure and use the latter directly as sleep channel. PR: kern/174684 Submitted by: jmg MFC after: 2 weeks Modified: head/sys/dev/tws/tws.h head/sys/dev/tws/tws_cam.c head/sys/dev/tws/tws_user.c Modified: head/sys/dev/tws/tws.h ============================================================================== --- head/sys/dev/tws/tws.h Thu Feb 27 21:01:10 2014 (r262571) +++ head/sys/dev/tws/tws.h Thu Feb 27 21:41:52 2014 (r262572) @@ -248,7 +248,6 @@ struct tws_softc { struct mtx io_lock; /* IO lock */ struct tws_ioctl_lock ioctl_lock; /* ioctl lock */ u_int32_t seq_id; /* Sequence id */ - void *chan; /* IOCTL req wait channel */ struct tws_circular_q aen_q; /* aen q */ struct tws_circular_q trace_q; /* trace q */ struct tws_stats stats; /* I/O stats */ Modified: head/sys/dev/tws/tws_cam.c ============================================================================== --- head/sys/dev/tws/tws_cam.c Thu Feb 27 21:01:10 2014 (r262571) +++ head/sys/dev/tws/tws_cam.c Thu Feb 27 21:41:52 2014 (r262572) @@ -1297,7 +1297,7 @@ tws_reinit(void *arg) tws_turn_on_interrupts(sc); - wakeup_one(sc->chan); + wakeup_one(sc); } Modified: head/sys/dev/tws/tws_user.c ============================================================================== --- head/sys/dev/tws/tws_user.c Thu Feb 27 21:01:10 2014 (r262571) +++ head/sys/dev/tws/tws_user.c Thu Feb 27 21:41:52 2014 (r262572) @@ -103,8 +103,7 @@ tws_passthru(struct tws_softc *sc, void do { req = tws_get_request(sc, TWS_REQ_TYPE_PASSTHRU); if ( !req ) { - sc->chan = (void *)sc; - error = tsleep(sc->chan, 0, "tws_sleep", TWS_IOCTL_TIMEOUT*hz); + error = tsleep(sc, 0, "tws_sleep", TWS_IOCTL_TIMEOUT*hz); if ( error == EWOULDBLOCK ) { return(ETIMEDOUT); } @@ -203,7 +202,7 @@ out_data: // req->state = TWS_REQ_STATE_FREE; - wakeup_one(sc->chan); + wakeup_one(sc); return(error); } _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"