From owner-svn-src-head@freebsd.org Fri Dec 30 00:41:15 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07128C979E5; Fri, 30 Dec 2016 00:41:15 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from st11p00im-asmtp002.me.com (st11p00im-asmtp002.me.com [17.172.80.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D2F4817AD; Fri, 30 Dec 2016 00:41:14 +0000 (UTC) (envelope-from rpokala@mac.com) Received: from process-dkim-sign-daemon.st11p00im-asmtp002.me.com by st11p00im-asmtp002.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) id <0OIZ00A002Q7A400@st11p00im-asmtp002.me.com>; Fri, 30 Dec 2016 00:41:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mac.com; s=4d515a; t=1483058467; bh=WIxk6NTYZRSHD46Rc8u5XNlNxT1uiJ0IV241iewp8LY=; h=Date:Subject:From:To:Message-id:MIME-version:Content-type; b=qnwj5cYFgWI5dmoo1o7Az26CUuhO/duLkIHYaNM9eA+hlYSXi1+C+4WIdoQmCCl0F vpkYWh7+BtsZQIU6IDDSUkuFPccQx0fJjcY8WVTZ7Lq518T29tA/bsra01s+5ntSVd ThxZwFMVDVJvUBza/U3S7SJ3sBpImcGLCzsU2Jfhu0YWccTo3FzQI/TMCQmqa2zXim azHy4dkheS7fELULsxursbXOmsndKzrYRCMwZFrsMYdQAb1Jw4Fh+tbvDKUfC1sh5n vVdZ4KHBbMMj9A9F/RscLZU9qt9s1v3dWurzom5hLOfODHZtbUPlm2bhLPUJaXsUwh glymK7+Q+Q0GA== Received: from [10.0.0.7] (c-73-6-177-70.hsd1.tx.comcast.net [73.6.177.70]) by st11p00im-asmtp002.me.com (Oracle Communications Messaging Server 7.0.5.38.0 64bit (built Feb 26 2016)) with ESMTPSA id <0OIZ00AS538H2K00@st11p00im-asmtp002.me.com>; Fri, 30 Dec 2016 00:41:07 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-12-29_19:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 clxscore=1034 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1603290000 definitions=main-1612300010 User-Agent: Microsoft-MacOutlook/f.1d.0.161209 Date: Thu, 29 Dec 2016 18:41:05 -0600 Subject: Re: svn commit: r310782 - head/sys/cam/ctl From: Ravi Pokala Sender: "Pokala, Ravi" To: Alexander Motin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-id: <18B83785-95E0-42B1-B359-72C94C2E5D0D@panasas.com> Thread-topic: svn commit: r310782 - head/sys/cam/ctl References: <201612291808.uBTI84k1029032@repo.freebsd.org> In-reply-to: <201612291808.uBTI84k1029032@repo.freebsd.org> MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Dec 2016 00:41:15 -0000 Hi Alexander, Wouldn't it be better to put the cast directly in the definition of CTL_SOFTC()? That puts the cast in a single place, and anything that calls CTL_SOFTC() will expect a (struct ctl_softc *) anyway. Thanks, and happy holidays! -Ravi (rpokala@) -----Original Message----- > From: on behalf of Alexander Motin > Date: 2016-12-29, Thursday at 12:08 > To: , , > Subject: svn commit: r310782 - head/sys/cam/ctl > > Author: mav > Date: Thu Dec 29 18:08:04 2016 > New Revision: 310782 > URL: https://svnweb.freebsd.org/changeset/base/310782 > > Log: > Fix build with enabled debug after r310778. > > MFC after: 2 weeks > > Modified: > head/sys/cam/ctl/ctl.c > > Modified: head/sys/cam/ctl/ctl.c > ============================================================================== > --- head/sys/cam/ctl/ctl.c Thu Dec 29 17:31:38 2016 (r310781) > +++ head/sys/cam/ctl/ctl.c Thu Dec 29 18:08:04 2016 (r310782) > @@ -12519,7 +12519,7 @@ ctl_datamove(union ctl_io *io) > { > void (*fe_datamove)(union ctl_io *io); > > - mtx_assert(&CTL_SOFTC(io)->ctl_lock, MA_NOTOWNED); > + mtx_assert(&((struct ctl_softc *)CTL_SOFTC(io))->ctl_lock, MA_NOTOWNED); > > CTL_DEBUG_PRINT(("ctl_datamove\n")); > > @@ -13012,7 +13012,7 @@ static void > ctl_datamove_remote(union ctl_io *io) > { > > - mtx_assert(&CTL_SOFTC(io)->ctl_lock, MA_NOTOWNED); > + mtx_assert(&((struct ctl_softc *)CTL_SOFTC(io))->ctl_lock, MA_NOTOWNED); > > if (io->io_hdr.flags & CTL_FLAG_FAILOVER) { > ctl_failover_io(io, /*have_lock*/ 0);