svn commit: r286002 - head/sys/kern

[Konstantin Belousov]

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)
 {