svn commit: r200939 - in stable/6/sys/boot: i386/libi386 pc98/libpc98

[Takahashi Yoshihiro]

Author: nyan
Date: Thu Dec 24 12:31:27 2009
New Revision: 200939
URL: http://svn.freebsd.org/changeset/base/200939

Log:
  MFC: revision 200631
  
    Fix debug messages of bd_io().

Modified:
  stable/6/sys/boot/i386/libi386/biosdisk.c
  stable/6/sys/boot/pc98/libpc98/biosdisk.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/biosdisk.c	Thu Dec 24 12:27:22 2009	(r200938)
+++ stable/6/sys/boot/i386/libi386/biosdisk.c	Thu Dec 24 12:31:27 2009	(r200939)
@@ -1268,11 +1268,11 @@ bd_io(struct open_disk *od, daddr_t dblk
 	}
 
 	if (write)
-	    DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p),
-		result ? "failed" : "ok");
+	    DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x,
+		p, VTOP(p), dblk, result ? "failed" : "ok");
 	else
-	    DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk,
-		result ? "failed" : "ok");
+	    DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x,
+		dblk, p, VTOP(p), result ? "failed" : "ok");
 	if (result) {
 	    return(-1);
 	}

Modified: stable/6/sys/boot/pc98/libpc98/biosdisk.c
==============================================================================
--- stable/6/sys/boot/pc98/libpc98/biosdisk.c	Thu Dec 24 12:27:22 2009	(r200938)
+++ stable/6/sys/boot/pc98/libpc98/biosdisk.c	Thu Dec 24 12:31:27 2009	(r200939)
@@ -846,11 +846,11 @@ bd_io(struct open_disk *od, daddr_t dblk
 	}
 
 	if (write)
-	    DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p),
-		result ? "failed" : "ok");
+	    DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x,
+		p, VTOP(p), dblk, result ? "failed" : "ok");
 	else
-	    DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk,
-		result ? "failed" : "ok");
+	    DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x,
+		dblk, p, VTOP(p), result ? "failed" : "ok");
 	if (result) {
 	    return(-1);
 	}