From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  1 21:16:03 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2C016A94;
 Fri,  1 Mar 2013 21:16:03 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 07F7B182E;
 Fri,  1 Mar 2013 21:16:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21LG2ie094754;
 Fri, 1 Mar 2013 21:16:02 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21LG27v094753;
 Fri, 1 Mar 2013 21:16:02 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303012116.r21LG27v094753@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 1 Mar 2013 21:16:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247582 - projects/calloutng/sys/kern
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.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Mar 2013 21:16:03 -0000

Author: mav
Date: Fri Mar  1 21:16:02 2013
New Revision: 247582
URL: http://svnweb.freebsd.org/changeset/base/247582

Log:
  Remove extra newlines.

Modified:
  projects/calloutng/sys/kern/kern_timeout.c

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Fri Mar  1 21:12:20 2013	(r247581)
+++ projects/calloutng/sys/kern/kern_timeout.c	Fri Mar  1 21:16:02 2013	(r247582)
@@ -958,10 +958,8 @@ callout_reset_sbt_on(struct callout *c, 
 		 * currently in progress.  If there is a lock then we
 		 * can cancel the callout if it has not really started.
 		 */
-		if (c->c_lock != NULL &&
-		    !cc->cc_exec_entity[direct].cc_cancel)
-			cancelled =
-			    cc->cc_exec_entity[direct].cc_cancel = 1;
+		if (c->c_lock != NULL && !cc->cc_exec_entity[direct].cc_cancel)
+			cancelled = cc->cc_exec_entity[direct].cc_cancel = 1;
 		if (cc->cc_exec_entity[direct].cc_waiting) {
 			/*
 			 * Someone has called callout_drain to kill this