From owner-p4-projects@FreeBSD.ORG  Tue Oct  7 16:05:08 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 2AEC7DE7; Tue,  7 Oct 2014 16:05:08 +0000 (UTC)
Delivered-To: perforce@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 E026BDE4
 for <perforce@freebsd.org>; Tue,  7 Oct 2014 16:05:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 CC726770
 for <perforce@freebsd.org>; Tue,  7 Oct 2014 16:05:07 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s97G57fs006573
 for <perforce@freebsd.org>; Tue, 7 Oct 2014 16:05:07 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s97G57H6006570
 for perforce@freebsd.org; Tue, 7 Oct 2014 16:05:07 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 7 Oct 2014 16:05:07 GMT
Message-Id: <201410071605.s97G57H6006570@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1201279 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 16:05:08 -0000

http://p4web.freebsd.org/@@1201279?ac=10

Change 1201279 by jhb@jhb_ralph on 2014/10/07 16:04:24

	Simplify this.

Affected files ...

.. //depot/projects/smpng/share/man/man9/timeout.9#19 edit

Differences ...

==== //depot/projects/smpng/share/man/man9/timeout.9#19 (text+ko) ====

@@ -180,9 +180,8 @@
 associated lock,
 the callout function is not called,
 and the associated lock is released.
-This guarantees that stopping or rescheduling the callout will not race with
-the callout function itself because the associated lock must be held to
-stop or reschedule the callout.
+This ensures that stopping or rescheduling the callout will abort any
+previously scheduled invocation.
 .Pp
 Only regular mutexes may be used with
 .Fn callout_init_mtx ;