From owner-svn-src-all@FreeBSD.ORG Wed Nov 7 19:46:35 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5DA3C91; Wed, 7 Nov 2012 19:46:35 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id A0FD78FC15; Wed, 7 Nov 2012 19:46:35 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id rp8so1552003pbb.13 for ; Wed, 07 Nov 2012 11:46:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=xC5JEBxxLLfOQp0t4tfhEVGPWbz5geh9BbT3qgdDhcg=; b=rcbMwa0qC3fs33ctWQ4E9ln5scTGqDG1yc19UFMayOXU1vC3wEA23MfbrY9nedF5Ex 3c6hVyIFHjA84pC8W3ZcstwRLGqYswLkaiXfsLuV/+0p82v/D4EQFtGhGLc0uR9om2kI JluAVy6xp0a1VoUzhD3BsqmGoNmzjOccpItffRz74N02U0sp0RUaXEOhUp0QfjC6oxRo ZaTLAkhVVNpsht6VQyWUON2m7c7t7yRayapPju/E/T5j66xACfrvt69uAxxKGaS96hC7 UDAedfE8DZ+lSgN5icGDTZiW1JJKgJfsLwdADjRjo7/c73B31vik+tx0zlG9V0UWKqIj 99Fw== MIME-Version: 1.0 Received: by 10.68.137.41 with SMTP id qf9mr16646331pbb.103.1352317594883; Wed, 07 Nov 2012 11:46:34 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.68.124.130 with HTTP; Wed, 7 Nov 2012 11:46:34 -0800 (PST) In-Reply-To: <201211071859.qA7IxgjE085220@svn.freebsd.org> References: <201211071859.qA7IxgjE085220@svn.freebsd.org> Date: Wed, 7 Nov 2012 11:46:34 -0800 X-Google-Sender-Auth: 0ejgLdiWQj3m1_5k1ANrYCRHt7E Message-ID: Subject: Re: svn commit: r242703 - head/sys/dev/usb/serial From: Adrian Chadd To: Hans Petter Selasky Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2012 19:46:36 -0000 Thanks for this. The auto-locking method is .. highly wrong/suspect. Please don't do that. :) Adrian On 7 November 2012 10:59, Hans Petter Selasky wrote: > Author: hselasky > Date: Wed Nov 7 18:59:42 2012 > New Revision: 242703 > URL: http://svnweb.freebsd.org/changeset/base/242703 > > Log: > Add lock asserts instead of "auto-locking". > > MFC after: 1 weeks > Suggested by: ed @ > > Modified: > head/sys/dev/usb/serial/usb_serial.c > > Modified: head/sys/dev/usb/serial/usb_serial.c > ============================================================================== > --- head/sys/dev/usb/serial/usb_serial.c Wed Nov 7 18:44:05 2012 (r242702) > +++ head/sys/dev/usb/serial/usb_serial.c Wed Nov 7 18:59:42 2012 (r242703) > @@ -788,20 +788,16 @@ ucom_inwakeup(struct tty *tp) > { > struct ucom_softc *sc = tty_softc(tp); > uint16_t pos; > - int locked; > > if (sc == NULL) > return; > > - locked = mtx_owned(sc->sc_mtx); > + UCOM_MTX_ASSERT(sc, MA_OWNED); > > - if (locked == 0) > - tty_lock(tp); > + DPRINTF("tp=%p\n", tp); > > if (ttydisc_can_bypass(tp) != 0 || > (sc->sc_flag & UCOM_FLAG_HL_READY) == 0) { > - if (locked == 0) > - tty_unlock(tp); > return; > } > > @@ -825,9 +821,6 @@ ucom_inwakeup(struct tty *tp) > if ((sc->sc_jitterbuf_in == pos) && > (sc->sc_flag & UCOM_FLAG_RTS_IFLOW)) > ucom_rts(sc, 0); > - > - if (locked == 0) > - tty_unlock(tp); > } > > static int