[DRBD-cvs] svn commit by phil - r2775 - in trunk: drbd user - Fixed a typo in drbdsetup.c Fixed two warnings when com

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-03-02 13:09:34 +0100 (Fri, 02 Mar 2007)
New Revision: 2775

Modified:
   trunk/drbd/drbd_actlog.c
   trunk/drbd/drbd_req.c
   trunk/user/drbdsetup.c
Log:
Fixed a typo in drbdsetup.c
Fixed two warnings when compiling on 64 bits.


Modified: trunk/drbd/drbd_actlog.c
===================================================================
--- trunk/drbd/drbd_actlog.c	2007-02-28 15:00:44 UTC (rev 2774)
+++ trunk/drbd/drbd_actlog.c	2007-03-02 12:09:34 UTC (rev 2775)
@@ -228,7 +228,8 @@
 
 	MTRACE(TraceTypeALExts,TraceLvlMetrics,
 	       INFO("al_begin_io( sec=%llus (al_enr=%u) (rs_enr=%d) )\n",
-		    sector, enr, (int)BM_SECT_TO_EXT(sector));
+		    (unsigned long long) sector, enr, 
+		    (int)BM_SECT_TO_EXT(sector));
 	       );
 
 	wait_event(mdev->al_wait, (al_ext = _al_get(mdev,enr)) );
@@ -276,7 +277,8 @@
 
 	MTRACE(TraceTypeALExts,TraceLvlMetrics,
 	       INFO("al_complete_io( sec=%llus (al_enr=%u) (rs_enr=%d) )\n",
-		    sector, enr, (int)BM_SECT_TO_EXT(sector));
+		    (unsigned long long) sector, enr, 
+		    (int)BM_SECT_TO_EXT(sector));
 	       );
 
 	spin_lock_irqsave(&mdev->al_lock,flags);

Modified: trunk/drbd/drbd_req.c
===================================================================
--- trunk/drbd/drbd_req.c	2007-02-28 15:00:44 UTC (rev 2774)
+++ trunk/drbd/drbd_req.c	2007-03-02 12:09:34 UTC (rev 2775)
@@ -146,7 +146,8 @@
 				dec_local(mdev);
 			} else {
 				WARN("Should have called drbd_al_complete_io(, %llu), "
-				     "but my Disk seems to have failed:(\n", req->sector);
+				     "but my Disk seems to have failed:(\n", 
+				     (unsigned long long) req->sector);
 			}
 		}
 	}

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2007-02-28 15:00:44 UTC (rev 2774)
+++ trunk/user/drbdsetup.c	2007-03-02 12:09:34 UTC (rev 2775)
@@ -372,7 +372,7 @@
 	"(up to 2TB in case you do not have CONFIG_LBD set)"
 	"Contact office at linbit.com, if you need more.",
 	EM(MDIOError) = "IO error(s) orruced during initial access to meta-data.\n",
-	EM(MDInvalid) = "No valid meta-data signature found.\n)"
+	EM(MDInvalid) = "No valid meta-data signature found.\n"
 	"Use 'drbdadm create-md res' to initialize meta-data area.\n",
 	EM(CRAMAlgNotAvail) = "The 'cram-hmac-alg' you specified is not known in "
 	"the kernel. (maybe you need to modprobe it, or modprobe hmac?)\n",