From owner-svn-src-head@FreeBSD.ORG  Fri Feb  6 20:06:49 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B529106566B;
	Fri,  6 Feb 2009 20:06:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F5D68FC16;
	Fri,  6 Feb 2009 20:06:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n16K6npB070278;
	Fri, 6 Feb 2009 20:06:49 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n16K6mNa070274;
	Fri, 6 Feb 2009 20:06:48 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200902062006.n16K6mNa070274@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 6 Feb 2009 20:06:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188244 - in head/sys: fs/fifofs kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2009 20:06:49 -0000

Author: jhb
Date: Fri Feb  6 20:06:48 2009
New Revision: 188244
URL: http://svn.freebsd.org/changeset/base/188244

Log:
  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().

Modified:
  head/sys/fs/fifofs/fifo_vnops.c
  head/sys/kern/kern_lock.c
  head/sys/kern/vfs_bio.c
  head/sys/kern/vfs_subr.c

Modified: head/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- head/sys/fs/fifofs/fifo_vnops.c	Fri Feb  6 18:16:01 2009	(r188243)
+++ head/sys/fs/fifofs/fifo_vnops.c	Fri Feb  6 20:06:48 2009	(r188244)
@@ -468,6 +468,7 @@ fifo_print(ap)
 		struct vnode *a_vp;
 	} */ *ap;
 {
+	printf("    ");
 	fifo_printinfo(ap->a_vp);
 	printf("\n");
 	return (0);

Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c	Fri Feb  6 18:16:01 2009	(r188243)
+++ head/sys/kern/kern_lock.c	Fri Feb  6 20:06:48 2009	(r188244)
@@ -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);
 	}
 

Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Fri Feb  6 18:16:01 2009	(r188243)
+++ head/sys/kern/vfs_bio.c	Fri Feb  6 20:06:48 2009	(r188244)
@@ -3920,6 +3920,7 @@ DB_SHOW_COMMAND(buffer, db_show_buffer)
 		}
 		db_printf("\n");
 	}
+	db_printf(" ");
 	lockmgr_printinfo(&bp->b_lock);
 }
 

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Fri Feb  6 18:16:01 2009	(r188243)
+++ head/sys/kern/vfs_subr.c	Fri Feb  6 20:06:48 2009	(r188244)
@@ -2719,7 +2719,6 @@ vn_printf(struct vnode *vp, const char *
 		    vp->v_object->resident_page_count);
 	printf("    ");
 	lockmgr_printinfo(vp->v_vnlock);
-	printf("\n");
 	if (vp->v_data != NULL)
 		VOP_PRINT(vp);
 }