From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 22:06:11 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 602A7AF5; Mon, 17 Dec 2012 22:06:11 +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 2BF048FC1A; Mon, 17 Dec 2012 22:06:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHM6Bus084787; Mon, 17 Dec 2012 22:06:11 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHM6BDl084786; Mon, 17 Dec 2012 22:06:11 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201212172206.qBHM6BDl084786@svn.freebsd.org> From: Alexander Motin Date: Mon, 17 Dec 2012 22:06:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244368 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 22:06:11 -0000 Author: mav Date: Mon Dec 17 22:06:10 2012 New Revision: 244368 URL: http://svnweb.freebsd.org/changeset/base/244368 Log: Remove unused timo argument from the seltdwait() function. Both of its consumers migrated to bintime and won't get back. Modified: projects/calloutng/sys/kern/sys_generic.c Modified: projects/calloutng/sys/kern/sys_generic.c ============================================================================== --- projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 21:23:02 2012 (r244367) +++ projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 22:06:10 2012 (r244368) @@ -102,8 +102,7 @@ static int dofilewrite(struct thread *, off_t, int); static void doselwakeup(struct selinfo *, int); static void seltdinit(struct thread *); -static int seltdwait(struct thread *, struct bintime *, struct bintime *, - int); +static int seltdwait(struct thread *, struct bintime *, struct bintime *); static void seltdclear(struct thread *); /* @@ -1024,10 +1023,10 @@ kern_select(struct thread *td, int nd, f TIMESEL(&rbt, &abt); if (bintime_cmp(&rbt, &abt, >=)) break; - error = seltdwait(td, &abt, &precision, 0); + error = seltdwait(td, &abt, &precision); } else { - error = seltdwait(td, NULL, NULL, 0); + error = seltdwait(td, NULL, NULL); } if (error) break; @@ -1306,9 +1305,9 @@ sys_poll(td, uap) TIMESEL(&rbt, &abt); if (bintime_cmp(&rbt, &abt, >=)) break; - error = seltdwait(td, &abt, &precision, 0); + error = seltdwait(td, &abt, &precision); } else { - error = seltdwait(td, NULL, NULL, 0); + error = seltdwait(td, NULL, NULL); } if (error) break; @@ -1651,8 +1650,7 @@ out: } static int -seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision, - int timo) +seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision) { struct seltd *stp; int error; @@ -1671,9 +1669,7 @@ seltdwait(struct thread *td, struct bint mtx_unlock(&stp->st_mtx); return (0); } - if (bt == NULL && timo > 0) - error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo); - else if (bt != NULL) + if (bt != NULL) error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx, bt, precision); else