From owner-svn-src-all@FreeBSD.ORG Sun Aug 31 21:46:33 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 853F67D0; Sun, 31 Aug 2014 21:46:33 +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 701F61DA0; Sun, 31 Aug 2014 21:46:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VLkX2f087330; Sun, 31 Aug 2014 21:46:33 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VLkXTD087329; Sun, 31 Aug 2014 21:46:33 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201408312146.s7VLkXTD087329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 31 Aug 2014 21:46:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270896 - stable/10/usr.sbin/autofs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 21:46:33 -0000 Author: trasz Date: Sun Aug 31 21:46:32 2014 New Revision: 270896 URL: http://svnweb.freebsd.org/changeset/base/270896 Log: MFC r270210: Remove useless - and buggy, it resulted in spurious warnings in logs - code. Sponsored by: The FreeBSD Foundation Modified: stable/10/usr.sbin/autofs/autounmountd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/autofs/autounmountd.c ============================================================================== --- stable/10/usr.sbin/autofs/autounmountd.c Sun Aug 31 21:45:07 2014 (r270895) +++ stable/10/usr.sbin/autofs/autounmountd.c Sun Aug 31 21:46:32 2014 (r270896) @@ -182,7 +182,6 @@ expire_automounted(double expiration_tim time_t now; double mounted_for, mounted_max = 0; int error; - bool unmounted = false; now = time(NULL); @@ -211,20 +210,9 @@ expire_automounted(double expiration_tim if (error != 0) { if (mounted_for > mounted_max) mounted_max = mounted_for; - } else { - unmounted = true; } } - if (unmounted) { - /* - * Successful unmount of a filesystem could unbusy its parent - * filesystem that can now be unmounted. - */ - log_debugx("filesystem got unmounted; go around"); - return (expire_automounted(expiration_time)); - } - return (mounted_max); }