From: Karel Zak <kzak@redhat.com>
Date: Tue, 3 Aug 2021 11:29:16 +0000 (+0200)
Subject: libblkid: (btrfs) add debug messages to zoned support
X-Git-Tag: v2.38-rc1~323
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2964fd916f4687dbab09ca91674703feffbb5833;p=thirdparty%2Futil-linux.git

libblkid: (btrfs) add debug messages to zoned support

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

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 0427759ddc..0207f79c15 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1014,8 +1014,8 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	}
 # endif
 
-	DBG(LOWPROBE, ul_debug("ready for low-probing, offset=%"PRIu64", size=%"PRIu64"",
-				pr->off, pr->size));
+	DBG(LOWPROBE, ul_debug("ready for low-probing, offset=%"PRIu64", size=%"PRIu64", zonesize=%"PRIu64,
+				pr->off, pr->size, pr->zone_size));
 	DBG(LOWPROBE, ul_debug("whole-disk: %s, regfile: %s",
 		blkid_probe_is_wholedisk(pr) ?"YES" : "NO",
 		S_ISREG(pr->mode) ? "YES" : "NO"));
diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c
index 03aa7e9792..9aeee6ea15 100644
--- a/libblkid/src/superblocks/btrfs.c
+++ b/libblkid/src/superblocks/btrfs.c
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
+#include <inttypes.h>
 
 #ifdef HAVE_LINUX_BLKZONED_H
 #include <linux/blkzoned.h>
@@ -126,6 +127,10 @@ static int sb_write_pointer(blkid_probe pr, struct blk_zone *zones, uint64_t *wp
 				blkid_probe_get_buffer(pr, bytenr, BTRFS_SUPER_INFO_SIZE);
 			if (!super[i])
 				return -EIO;
+			DBG(LOWPROBE, ul_debug("(btrfs) checking #%d zone "
+						"[start=%" PRIu64", len=%" PRIu64", sb-offset=%" PRIu64"]",
+						i, (uint64_t) zones[i].start,
+						(uint64_t) zones[i].len, bytenr));
 		}
 
 		if (super[0]->generation > super[1]->generation)
@@ -140,6 +145,8 @@ static int sb_write_pointer(blkid_probe pr, struct blk_zone *zones, uint64_t *wp
 		return -EUCLEAN;
 	}
 	*wp_ret = sector << SECTOR_SHIFT;
+
+	DBG(LOWPROBE, ul_debug("(btrfs) write pointer: %" PRIu64" sector", sector));
 	return 0;
 }
 
@@ -168,6 +175,7 @@ static int sb_log_offset(blkid_probe pr, uint64_t *bytenr_ret)
 	 */
 	for (i = 0; i < BTRFS_NR_SB_LOG_ZONES; i++) {
 		if (zones[i].type == BLK_ZONE_TYPE_CONVENTIONAL) {
+			DBG(LOWPROBE, ul_debug("(btrfs) checking conventional zone"));
 			*bytenr_ret = zones[i].start << SECTOR_SHIFT;
 			ret = 0;
 			goto out;