Tweak the output of VOP_PRINT/vn_printf() some.

- Align the fifo output in fifo_print() with other vn_printf() output.
- Remove the leading space from lockmgr_printinfo() so its output lines up
  in vn_printf().
- lockmgr_printinfo() now ends with a newline, so remove an extra newline
  from vn_printf().

3 files changed, 4 insertions, 4 deletions

diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 2bb02fd..b2294f8 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -897,14 +897,14 @@ lockmgr_printinfo(struct lock *lk)
 	uintptr_t x;
 
 	if (lk->lk_lock == LK_UNLOCKED)
-		printf(" lock type %s: UNLOCKED\n", lk->lock_object.lo_name);
+		printf("lock type %s: UNLOCKED\n", lk->lock_object.lo_name);
 	else if (lk->lk_lock & LK_SHARE)
-		printf(" lock type %s: SHARED (count %ju)\n",
+		printf("lock type %s: SHARED (count %ju)\n",
 		    lk->lock_object.lo_name,
 		    (uintmax_t)LK_SHARERS(lk->lk_lock));
 	else {
 		td = lockmgr_xholder(lk);
-		printf(" lock type %s: EXCL by thread %p (pid %d)\n",
+		printf("lock type %s: EXCL by thread %p (pid %d)\n",
 		    lk->lock_object.lo_name, td, td->td_proc->p_pid);
 	}
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index f75963d..667ea2d 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3920,6 +3920,7 @@ DB_SHOW_COMMAND(buffer, db_show_buffer)
 		}
 		db_printf("\n");
 	}
+	db_printf(" ");
 	lockmgr_printinfo(&bp->b_lock);
 }
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 952b3a4..6f1cdf3 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -2719,7 +2719,6 @@ vn_printf(struct vnode *vp, const char *fmt, ...)
 		    vp->v_object->resident_page_count);
 	printf("    ");
 	lockmgr_printinfo(vp->v_vnlock);
-	printf("\n");
 	if (vp->v_data != NULL)
 		VOP_PRINT(vp);
 }