LVM2/lib/label label.c

LVM2/lib/label label.c

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2008-08-28 13:28:13

Modified files:
	lib/label      : label.c 

Log message:
	Not detecing label on disc is not error, remove <backtrace> from debug log
	and report it only if device cannot be read.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/label/label.c.diff?cvsroot=lvm2&r1=1.42&r2=1.43

--- LVM2/lib/label/label.c	2008/02/06 15:47:28	1.42
+++ LVM2/lib/label/label.c	2008/08/28 13:28:13	1.43
@@ -119,7 +119,7 @@
 	if (!dev_read(dev, scan_sector << SECTOR_SHIFT,
 		      LABEL_SCAN_SIZE, readbuf)) {
 		log_debug("%s: Failed to read label area", dev_name(dev));
-		goto out;
+		goto_out;
 	}
 
 	/* Scan a few sectors for a valid label */
@@ -284,7 +284,7 @@
 	}
 
 	if (!(l = _find_labeller(dev, buf, &sector, scan_sector)))
-		goto_out;
+		goto out;
 
 	if ((r = (l->ops->read)(l, dev, buf, result)) && result && *result)
 		(*result)->sector = sector;
@@ -361,7 +361,7 @@
 	}
 
 	if (!(l = _find_labeller(dev, buf, &sector, UINT64_C(0))))
-		goto_out;
+		goto out;
 
 	r = l->ops->verify ? l->ops->verify(l, buf, sector) : 1;
 

LVM2/lib/label label.c

[mpatocka]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mpatocka@sourceware.org	2009-07-13 21:23:48

Modified files:
	lib/label      : label.c 

Log message:
	Suppress warning on 64-bit big-endian computers (Sparc 64).
	
	xlate64 produces unsigned long long type, but PRIu64 is defined
	to accept argument unsigned long type (on 64-bit machines).
	
	On existing machines, both types have the same size, so it works,
	but it is still wrong and produces a warning.
	
	Fix it by using a cast to uint64_t --- according to the standard,
	PRIu64 argument matches type uint64_t.
	
	Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/label/label.c.diff?cvsroot=lvm2&r1=1.47&r2=1.48

--- LVM2/lib/label/label.c	2009/07/08 22:18:32	1.47
+++ LVM2/lib/label/label.c	2009/07/13 21:23:48	1.48
@@ -138,7 +138,7 @@
 				log_info("%s: Label for sector %" PRIu64
 					 " found at sector %" PRIu64
 					 " - ignoring", dev_name(dev),
-					 xlate64(lh->sector_xl),
+					 (uint64_t)xlate64(lh->sector_xl),
 					 sector + scan_sector);
 				continue;
 			}