From owner-svn-src-all@freebsd.org  Tue Jan 12 14:18:56 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F622A6C273;
 Tue, 12 Jan 2016 14:18:56 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 20D1913C4;
 Tue, 12 Jan 2016 14:18:56 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CEItqi007690;
 Tue, 12 Jan 2016 14:18:55 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CEIt4J007689;
 Tue, 12 Jan 2016 14:18:55 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201601121418.u0CEIt4J007689@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 12 Jan 2016 14:18:55 +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: r293759 - stable/10/sys/kern
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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2016 14:18:56 -0000

Author: trasz
Date: Tue Jan 12 14:18:54 2016
New Revision: 293759
URL: https://svnweb.freebsd.org/changeset/base/293759

Log:
  Hide the "unmount of /dev failed (BUSY)" warning at shutdown or reboot,
  introduced with r293742, just like it was hidden before that commit.
  
  This is a direct commit to 10-STABLE; this special case is not needed
  in 11-CURRENT, because devfs supports forced unmounts there.  The forced
  unmount could be MFC-ed, but there are some LORs at shutdown, and I have
  a weird feelings about it.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/kern/vfs_subr.c

Modified: stable/10/sys/kern/vfs_subr.c
==============================================================================
--- stable/10/sys/kern/vfs_subr.c	Tue Jan 12 13:42:27 2016	(r293758)
+++ stable/10/sys/kern/vfs_subr.c	Tue Jan 12 14:18:54 2016	(r293759)
@@ -3734,7 +3734,7 @@ unmount_or_warn(struct mount *mp)
 	int error;
 
 	error = dounmount(mp, MNT_FORCE, curthread);
-	if (error != 0) {
+	if (error != 0 && strcmp(mp->mnt_vfc->vfc_name, "devfs") != 0) {
 		printf("unmount of %s failed (", mp->mnt_stat.f_mntonname);
 		if (error == EBUSY)
 			printf("BUSY)\n");