From owner-svn-src-all@freebsd.org  Wed Jul 29 09:57:35 2015
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 D52D99AEF9F;
 Wed, 29 Jul 2015 09:57:35 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 C03E4AD5;
 Wed, 29 Jul 2015 09:57:35 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6T9vZtL061727;
 Wed, 29 Jul 2015 09:57:35 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6T9vZwo061726;
 Wed, 29 Jul 2015 09:57:35 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201507290957.t6T9vZwo061726@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 29 Jul 2015 09:57:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286002 - head/sys/kern
X-SVN-Group: head
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jul 2015 09:57:35 -0000

Author: kib
Date: Wed Jul 29 09:57:34 2015
New Revision: 286002
URL: https://svnweb.freebsd.org/changeset/base/286002

Log:
  Move bufshutdown() out of the #ifdef INVARIANTS block.

Modified:
  head/sys/kern/vfs_bio.c

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Wed Jul 29 08:12:05 2015	(r286001)
+++ head/sys/kern/vfs_bio.c	Wed Jul 29 09:57:34 2015	(r286002)
@@ -958,6 +958,22 @@ vfs_buf_check_mapped(struct buf *bp)
 	KASSERT(bp->b_data < unmapped_buf || bp->b_data > unmapped_buf +
 	    MAXPHYS, ("b_data + b_offset unmapped %p", bp));
 }
+
+static inline void
+vfs_buf_check_unmapped(struct buf *bp)
+{
+
+	KASSERT(bp->b_data == unmapped_buf,
+	    ("unmapped buf: corrupted b_data %p", bp));
+}
+
+#define	BUF_CHECK_MAPPED(bp) vfs_buf_check_mapped(bp)
+#define	BUF_CHECK_UNMAPPED(bp) vfs_buf_check_unmapped(bp)
+#else
+#define	BUF_CHECK_MAPPED(bp) do {} while (0)
+#define	BUF_CHECK_UNMAPPED(bp) do {} while (0)
+#endif
+
 static int
 isbufbusy(struct buf *bp)
 {
@@ -1087,21 +1103,6 @@ bufshutdown(int show_busybufs)
 	DELAY(100000);		/* wait for console output to finish */
 }
 
-static inline void
-vfs_buf_check_unmapped(struct buf *bp)
-{
-
-	KASSERT(bp->b_data == unmapped_buf,
-	    ("unmapped buf: corrupted b_data %p", bp));
-}
-
-#define	BUF_CHECK_MAPPED(bp) vfs_buf_check_mapped(bp)
-#define	BUF_CHECK_UNMAPPED(bp) vfs_buf_check_unmapped(bp)
-#else
-#define	BUF_CHECK_MAPPED(bp) do {} while (0)
-#define	BUF_CHECK_UNMAPPED(bp) do {} while (0)
-#endif
-
 static void
 bpmap_qenter(struct buf *bp)
 {