[src/trunk]: src/sys/ufs/lfs Drop single use macro LFS_BCLEAN_LOG with an inl...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04800af2c024
branches:  trunk
changeset: 822760:04800af2c024
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Apr 06 01:54:23 2017 +0000

description:
Drop single use macro LFS_BCLEAN_LOG with an inlined implementation.

LFS_ENTER_LOG currently macro grabs lfs_lock, so I'd like to have just one
name for it.

diffstat:

 sys/ufs/lfs/lfs_inode.h   |   8 +-------
 sys/ufs/lfs/lfs_segment.c |  10 +++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (53 lines):

diff -r a0eb4c146bed -r 04800af2c024 sys/ufs/lfs/lfs_inode.h
--- a/sys/ufs/lfs/lfs_inode.h   Thu Apr 06 01:54:17 2017 +0000
+++ b/sys/ufs/lfs/lfs_inode.h   Thu Apr 06 01:54:23 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.h,v 1.16 2016/06/20 03:29:52 dholland Exp $  */
+/*     $NetBSD: lfs_inode.h,v 1.17 2017/04/06 01:54:23 maya Exp $      */
 /*  from NetBSD: ulfs_inode.h,v 1.5 2013/06/06 00:51:50 dholland Exp  */
 /*  from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp  */
 
@@ -253,12 +253,6 @@
        mutex_exit(&lfs_lock);                                          \
 } while (0)
 
-#  define LFS_BCLEAN_LOG(fs, bp) do {                                  \
-       if ((bp)->b_vp == (fs)->lfs_ivnode)                             \
-               LFS_ENTER_LOG("clear", __FILE__, __LINE__,              \
-                             bp->b_lblkno, bp->b_flags, curproc->p_pid);\
-} while (0)
-
 /* Must match list in lfs_vfsops.c ! */
 #  define DLOG_RF     0  /* roll forward */
 #  define DLOG_ALLOC  1  /* inode alloc */
diff -r a0eb4c146bed -r 04800af2c024 sys/ufs/lfs/lfs_segment.c
--- a/sys/ufs/lfs/lfs_segment.c Thu Apr 06 01:54:17 2017 +0000
+++ b/sys/ufs/lfs/lfs_segment.c Thu Apr 06 01:54:23 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_segment.c,v 1.265 2017/04/01 19:35:56 riastradh Exp $      */
+/*     $NetBSD: lfs_segment.c,v 1.266 2017/04/06 01:54:23 maya Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.265 2017/04/01 19:35:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.266 2017/04/06 01:54:23 maya Exp $");
 
 #ifdef DEBUG
 # define vndebug(vp, str) do {                                         \
@@ -2572,7 +2572,11 @@
 
                tbp->b_flags &= ~B_GATHERED;
 
-               LFS_BCLEAN_LOG(fs, tbp);
+#ifdef DEBUG
+               if ((tbp)->b_vp == (fs)->lfs_ivnode)
+                       LFS_ENTER_LOG("clear", __FILE__, __LINE__,
+                           tbp->b_lblkno, tbp->b_flags, curproc->p_pid);
+#endif
 
                mutex_enter(&bufcache_lock);
                if (tbp->b_iodone == NULL) {