From: Karel Zak <kzak@redhat.com>
Date: Wed, 20 Feb 2013 09:43:30 +0000 (+0100)
Subject: libblkid: add debug messages for "idmag" stuff and btrfs
X-Git-Tag: v2.23-rc1~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4dc853a4d4ad43593e3ab3aada8de6fb35cda12;p=thirdparty%2Futil-linux.git

libblkid: add debug messages for "idmag" stuff and btrfs

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index e0ac8ebac7..77e8b860c8 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -815,6 +815,7 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id,
 static inline void blkid_probe_start(blkid_probe pr)
 {
 	if (pr) {
+		DBG(DEBUG_LOWPROBE, printf("%p: start probe\n", pr));
 		pr->cur_chain = NULL;
 		pr->prob_flags = 0;
 		blkid_probe_set_wiper(pr, 0, 0);
@@ -824,6 +825,7 @@ static inline void blkid_probe_start(blkid_probe pr)
 static inline void blkid_probe_end(blkid_probe pr)
 {
 	if (pr) {
+		DBG(DEBUG_LOWPROBE, printf("%p: end probe\n", pr));
 		pr->cur_chain = NULL;
 		pr->prob_flags = 0;
 		blkid_probe_set_wiper(pr, 0, 0);
diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index 552097b979..5813035f3f 100644
--- a/libblkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
@@ -63,8 +63,10 @@ static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag)
 {
 	struct btrfs_super_block *bfs;
 
-	if (mag->kboff > 64 && blkid_probe_ignore_backup(pr))
+	if (mag->kboff > 64 && blkid_probe_ignore_backup(pr)) {
+		DBG(DEBUG_LOWPROBE, printf("btrfs: found backup superblock, ignore\n"));
 		return 1;
+	}
 
 	bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block);
 	if (!bfs)