Date: Sun, 30 Aug 2015 13:44:46 +0000 (UTC) From: Julien Charbon <jch@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287305 - head/sys/kern Message-ID: <201508301344.t7UDikio051452@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jch Date: Sun Aug 30 13:44:46 2015 New Revision: 287305 URL: https://svnweb.freebsd.org/changeset/base/287305 Log: Revert r286880: If at first this change made sense, it turns out it helps only the TCP timers callout(9) usage. As the benefit for others callout(9) usages did not reach a consensus the historical usage should prevail. Differential Revision: https://reviews.freebsd.org/D3078 Modified: head/sys/kern/kern_timeout.c Modified: head/sys/kern/kern_timeout.c ============================================================================== --- head/sys/kern/kern_timeout.c Sun Aug 30 13:44:39 2015 (r287304) +++ head/sys/kern/kern_timeout.c Sun Aug 30 13:44:46 2015 (r287305) @@ -1151,7 +1151,6 @@ _callout_stop_safe(struct callout *c, in struct lock_class *class; int direct, sq_locked, use_lock; int not_on_a_list; - int not_running = 1; if (safe) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, c->c_lock, @@ -1379,17 +1378,8 @@ again: } } callout_cc_del(c, cc); - - if (!use_lock) { - /* - * If we are asked to stop a callout which is currently in progress - * and indeed impossible to stop then return 0. - */ - not_running = !(cc_exec_curr(cc, direct) == c); - } - CC_UNLOCK(cc); - return (not_running); + return (1); } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508301344.t7UDikio051452>