From owner-svn-src-projects@FreeBSD.ORG Sun Nov 16 18:44:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35A96712; Sun, 16 Nov 2014 18:44:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21FA397E; Sun, 16 Nov 2014 18:44:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGIikNi036459; Sun, 16 Nov 2014 18:44:46 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGIikKq036455; Sun, 16 Nov 2014 18:44:46 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411161844.sAGIikKq036455@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 16 Nov 2014 18:44:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274590 - projects/routing/sys/net 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.18-1 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: Sun, 16 Nov 2014 18:44:47 -0000 Author: melifaro Date: Sun Nov 16 18:44:46 2014 New Revision: 274590 URL: https://svnweb.freebsd.org/changeset/base/274590 Log: Finish r274335: * put RT_LOCK_DESTROY() back * remove unused RT_UNLOCK_COND macro Modified: projects/routing/sys/net/route.c projects/routing/sys/net/route_internal.h Modified: projects/routing/sys/net/route.c ============================================================================== --- projects/routing/sys/net/route.c Sun Nov 16 18:15:23 2014 (r274589) +++ projects/routing/sys/net/route.c Sun Nov 16 18:44:46 2014 (r274590) @@ -496,6 +496,7 @@ rtfree(struct rtentry *rt) /* * and the rtentry itself of course */ + RT_LOCK_DESTROY(rt); uma_zfree(V_rtzone, rt); return; } Modified: projects/routing/sys/net/route_internal.h ============================================================================== --- projects/routing/sys/net/route_internal.h Sun Nov 16 18:15:23 2014 (r274589) +++ projects/routing/sys/net/route_internal.h Sun Nov 16 18:44:46 2014 (r274590) @@ -91,10 +91,6 @@ struct rtentry { #define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx) #define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx) #define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED) -#define RT_UNLOCK_COND(_rt) do { \ - if (mtx_owned(&(_rt)->rt_mtx)) \ - mtx_unlock(&(_rt)->rt_mtx); \ -} while (0) #define RT_ADDREF(_rt) do { \ RT_LOCK_ASSERT(_rt); \