volume_id: move some debug to info level

diff --git a/extras/volume_id/lib/cramfs.c b/extras/volume_id/lib/cramfs.c
index beb34d5bc0442e13202cdaa891aa74371a3a7f7e..100ebdec22fd06b5f78bbe117cdcc67bfbd66d18 100644 (file)
--- a/extras/volume_id/lib/cramfs.c
+++ b/extras/volume_id/lib/cramfs.c
@@ -45,7 +45,7 @@ int volume_id_probe_cramfs(struct volume_id *id, uint64_t off)
 {
        struct cramfs_super *cs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        cs = (struct cramfs_super *) volume_id_get_buffer(id, off, 0x200);
        if (cs == NULL)

diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c
index 51c0011218f5ac1551acdd3d40f62f4d686344a2..7d41a3287e0e2935c04f938efbb66ade78fb9ce6 100644 (file)
--- a/extras/volume_id/lib/ext.c
+++ b/extras/volume_id/lib/ext.c
@@ -75,7 +75,7 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off)
        struct ext2_super_block *es;
        size_t bsize;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        es = (struct ext2_super_block *) volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
        if (es == NULL)

diff --git a/extras/volume_id/lib/fat.c b/extras/volume_id/lib/fat.c
index 9a11eaad55e53df9c410efe3330660e244e78af4..74336b4e6d0df79ca773e382d04d4f4ba5d6e7d3 100644 (file)
--- a/extras/volume_id/lib/fat.c
+++ b/extras/volume_id/lib/fat.c
@@ -147,7 +147,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off)
        uint32_t next;
        int maxloop;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
        if (vs == NULL)

diff --git a/extras/volume_id/lib/hfs.c b/extras/volume_id/lib/hfs.c
index f666b183790d8c74ccff836d46034fbb06b3d5ac..4e34d66ba424021ecb11d2c68663522402c4df2f 100644 (file)
--- a/extras/volume_id/lib/hfs.c
+++ b/extras/volume_id/lib/hfs.c
@@ -160,7 +160,7 @@ int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off)
        struct hfsplus_extent extents[HFSPLUS_EXTENT_COUNT];
        const uint8_t *buf;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
        if (buf == NULL)

diff --git a/extras/volume_id/lib/highpoint.c b/extras/volume_id/lib/highpoint.c
index deba540ad586f14ce70bff48d2501f7c7569c091..e441edb776fd3e7381da38d38c376295ced02969 100644 (file)
--- a/extras/volume_id/lib/highpoint.c
+++ b/extras/volume_id/lib/highpoint.c
@@ -49,7 +49,7 @@ int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
        struct hpt37x_meta *hpt;
        uint32_t magic;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + HPT37X_CONFIG_OFF, 0x200);
        if (buf == NULL)

diff --git a/extras/volume_id/lib/hpfs.c b/extras/volume_id/lib/hpfs.c
index 3e9589fccafb80e9a9a53d6a5b2425a1512341e1..6fec9caf8dcf91bbc3bea2d627d1c9d4a6d28737 100644 (file)
--- a/extras/volume_id/lib/hpfs.c
+++ b/extras/volume_id/lib/hpfs.c
@@ -38,7 +38,7 @@ int volume_id_probe_hpfs(struct volume_id *id, uint64_t off)
 {
        struct hpfs_super *hs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        hs = (struct hpfs_super *) volume_id_get_buffer(id, off + HPFS_SUPERBLOCK_OFFSET, 0x200);
        if (hs == NULL)

diff --git a/extras/volume_id/lib/iso9660.c b/extras/volume_id/lib/iso9660.c
index 7b78a7e99285b964b3ddfb01adb5e2c1c9e2122f..be64a8b8af4e75d6d20f412cfee6b53228092504 100644 (file)
--- a/extras/volume_id/lib/iso9660.c
+++ b/extras/volume_id/lib/iso9660.c
@@ -59,7 +59,7 @@ int volume_id_probe_iso9660(struct volume_id *id, uint64_t off)
        struct iso_volume_descriptor *is;
        struct high_sierra_volume_descriptor *hs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + ISO_SUPERBLOCK_OFFSET, 0x200);
        if (buf == NULL)

diff --git a/extras/volume_id/lib/isw_raid.c b/extras/volume_id/lib/isw_raid.c
index 6465a31bf52914ad29582af13ff664b430b5826d..f5761e826bbfafda45275cb2c7270abb9b227ecf 100644 (file)
--- a/extras/volume_id/lib/isw_raid.c
+++ b/extras/volume_id/lib/isw_raid.c
@@ -43,7 +43,7 @@ int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint
        uint64_t meta_off;
        struct isw_meta *isw;
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)

diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c
index b230fb258c49ad933764853b1a1ff221d45ad566..80360915a4dde2809add2903d0061d714349c84e 100644 (file)
--- a/extras/volume_id/lib/jfs.c
+++ b/extras/volume_id/lib/jfs.c
@@ -45,7 +45,7 @@ int volume_id_probe_jfs(struct volume_id *id, uint64_t off)
 {
        struct jfs_super_block *js;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200);
        if (js == NULL)

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index ad4a5ba4d679168a398fd9b60b7c869a16dfef4a..17819375baa174392e372a88992962245bfef7d6 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -54,7 +54,7 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
        uint64_t sboff;
        uint8_t uuid[16];
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index b63f1e6c002b622dc05f5366f20ec87039ef5d85..3937f8ea467241bd59ea547fd2865fb2cb991c53 100644 (file)
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -42,7 +42,7 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off)
        const uint8_t *buf;
        unsigned int page;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        /* the swap signature is at the end of the PAGE_SIZE */
        for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {

diff --git a/extras/volume_id/lib/lsi_raid.c b/extras/volume_id/lib/lsi_raid.c
index f1db4a6e50b305c8c246c3d2007edbcd633d8915..56fd5671d369b16303eb13d1e197a3dc4e237496 100644 (file)
--- a/extras/volume_id/lib/lsi_raid.c
+++ b/extras/volume_id/lib/lsi_raid.c
@@ -38,7 +38,7 @@ int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t s
        uint64_t meta_off;
        struct lsi_meta *lsi;
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)

diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c
index 47d84b09686206b26be93441e383dea2f52a91b2..727204280b3fd67edeb9ce0c784362e039a090bf 100644 (file)
--- a/extras/volume_id/lib/lvm.c
+++ b/extras/volume_id/lib/lvm.c
@@ -46,7 +46,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off)
        const uint8_t *buf;
        struct lvm1_super_block *lvm;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800);
        if (buf == NULL)

diff --git a/extras/volume_id/lib/minix.c b/extras/volume_id/lib/minix.c
index 75e9c3acbd8b1c0dfb5a29ebbb9891489392253a..c5e16e783b39fd3ebccca09027aa58fcb19dc8c0 100644 (file)
--- a/extras/volume_id/lib/minix.c
+++ b/extras/volume_id/lib/minix.c
@@ -46,7 +46,7 @@ int volume_id_probe_minix(struct volume_id *id, uint64_t off)
 {
        struct minix_super_block *ms;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        ms = (struct minix_super_block *) volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
        if (ms == NULL)

diff --git a/extras/volume_id/lib/ntfs.c b/extras/volume_id/lib/ntfs.c
index f1e8c4bc294422e6781302ad34d25c7f777e9c88..5f2a5b93a262e095709259819d27453f1f0d55c3 100644 (file)
--- a/extras/volume_id/lib/ntfs.c
+++ b/extras/volume_id/lib/ntfs.c
@@ -105,7 +105,7 @@ int volume_id_probe_ntfs(struct volume_id *id, uint64_t off)
        const uint8_t *buf;
        const uint8_t *val;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200);
        if (ns == NULL)

diff --git a/extras/volume_id/lib/nvidia_raid.c b/extras/volume_id/lib/nvidia_raid.c
index 10c1c714f7a477a0c599a9428eaeaeb9ae77ad90..ca4245930761dd332e94d535a4171b25a1d19ff8 100644 (file)
--- a/extras/volume_id/lib/nvidia_raid.c
+++ b/extras/volume_id/lib/nvidia_raid.c
@@ -41,7 +41,7 @@ int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t siz
        uint64_t meta_off;
        struct nvidia_meta *nv;
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)

diff --git a/extras/volume_id/lib/ocfs.c b/extras/volume_id/lib/ocfs.c
index b376ead8330d50380ecad57dc8a0df595842aed0..bf311415dddc4431155a691001a8e00c2998f2cf 100644 (file)
--- a/extras/volume_id/lib/ocfs.c
+++ b/extras/volume_id/lib/ocfs.c
@@ -132,6 +132,8 @@ int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off)
        struct ocfs1_super_block_header *osh;
        struct ocfs1_super_block_label *osl;
 
+       info("probing at offset 0x%llx", (unsigned long long) off);
+
        buf = volume_id_get_buffer(id, off, 0x200);
        if (buf == NULL)
                return -1;
@@ -168,7 +170,7 @@ int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off)
        struct ocfs2_super_block *os;
        size_t blksize;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        for (blksize = 0x200; blksize <= OCFS2_MAX_BLOCKSIZE; blksize <<= 1) {
                buf = volume_id_get_buffer(id, off + OCFS2_SUPER_BLOCK_BLKNO * blksize, 0x200);

diff --git a/extras/volume_id/lib/promise_raid.c b/extras/volume_id/lib/promise_raid.c
index 2a2ce1689e01273a1105b1e8c5cd2d71f8d373bf..1c4d3658ce56efb2be784dbb8ab5839471c75a03 100644 (file)
--- a/extras/volume_id/lib/promise_raid.c
+++ b/extras/volume_id/lib/promise_raid.c
@@ -42,7 +42,7 @@ int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, u
                63, 255, 256, 16, 399, 0
        };
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x40000)

diff --git a/extras/volume_id/lib/reiserfs.c b/extras/volume_id/lib/reiserfs.c
index b5706f86e0ff9024e5a03bf63545a6ba306b2fa5..abeb06b88f6f0f6245c81a929cede20e4345d17e 100644 (file)
--- a/extras/volume_id/lib/reiserfs.c
+++ b/extras/volume_id/lib/reiserfs.c
@@ -60,7 +60,7 @@ int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off)
        struct reiser4_super_block *rs4;
        uint8_t  *buf;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        buf = volume_id_get_buffer(id, off + REISERFS_SUPERBLOCK_OFFSET, 0x200);
        if (buf == NULL)

diff --git a/extras/volume_id/lib/romfs.c b/extras/volume_id/lib/romfs.c
index 8bb2a0018afabfdb409aceef29950a662b82c990..a88781e36ecb8b8217974a24b0a1ad3827027efe 100644 (file)
--- a/extras/volume_id/lib/romfs.c
+++ b/extras/volume_id/lib/romfs.c
@@ -37,7 +37,7 @@ int volume_id_probe_romfs(struct volume_id *id, uint64_t off)
 {
        struct romfs_super *rfs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        rfs = (struct romfs_super *) volume_id_get_buffer(id, off, 0x200);
        if (rfs == NULL)

diff --git a/extras/volume_id/lib/silicon_raid.c b/extras/volume_id/lib/silicon_raid.c
index 017b023e27ecdad75f3c1911a7a92f9e6c797762..634e4abd0bb9057401ffd05592dc76fd4346e826 100644 (file)
--- a/extras/volume_id/lib/silicon_raid.c
+++ b/extras/volume_id/lib/silicon_raid.c
@@ -53,7 +53,7 @@ int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint
        uint64_t meta_off;
        struct silicon_meta *sil;
 
-       dbg("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)

diff --git a/extras/volume_id/lib/squashfs.c b/extras/volume_id/lib/squashfs.c
index bdb1f16628b7345e8fa8d2109181ae9fdaeaf472..fdba64edbce025b76c9e577794e9c2bcbe63335a 100644 (file)
--- a/extras/volume_id/lib/squashfs.c
+++ b/extras/volume_id/lib/squashfs.c
@@ -36,7 +36,7 @@ int volume_id_probe_squashfs(struct volume_id *id, uint64_t off)
 {
        struct squashfs_super *sqs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        sqs = (struct squashfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
        if (sqs == NULL)

diff --git a/extras/volume_id/lib/sysv.c b/extras/volume_id/lib/sysv.c
index 52349c0623961a264a4e7086b606b7c0b04fb5aa..6e0ed046f0b357b6f323c3d6683a4a219e79554a 100644 (file)
--- a/extras/volume_id/lib/sysv.c
+++ b/extras/volume_id/lib/sysv.c
@@ -95,7 +95,7 @@ int volume_id_probe_sysv(struct volume_id *id, uint64_t off)
        struct xenix_super *xs;
        unsigned int boff;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        for (boff = 0x200; boff <= SYSV_MAX_BLOCKSIZE; boff <<= 1) {
                vs = (struct sysv_super *)

diff --git a/extras/volume_id/lib/udf.c b/extras/volume_id/lib/udf.c
index d7497ec51b8e06d1513acfeec667b5a8c159f5c6..d71e9d6f5d07fe15ef09396bb75208692321c8f5 100644 (file)
--- a/extras/volume_id/lib/udf.c
+++ b/extras/volume_id/lib/udf.c
@@ -72,7 +72,7 @@ int volume_id_probe_udf(struct volume_id *id, uint64_t off)
        unsigned int loc;
        unsigned int clen;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        vsd = (struct volume_structure_descriptor *) volume_id_get_buffer(id, off + UDF_VSD_OFFSET, 0x200);
        if (vsd == NULL)

diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c
index d3960b1bec3754251651409faad9b5e278f739dd..8255b6e7912d5b4b2932235dfff311e2361aa3d6 100644 (file)
--- a/extras/volume_id/lib/ufs.c
+++ b/extras/volume_id/lib/ufs.c
@@ -175,7 +175,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
        struct ufs_super_block *ufs;
        int offsets[] = {0, 8, 64, 256, -1};
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        for (i = 0; offsets[i] >= 0; i++) {     
                ufs = (struct ufs_super_block *) volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index cf5392cf9aba7fe1512b9f0b6b3fa0f15bbd4466..09bfc6750029916e164c561d85855e2d6b616126 100644 (file)
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -180,7 +180,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 {
        ssize_t buf_len;
 
-       dbg("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len);
+       info("get buffer off 0x%llx(%llu), len 0x%zx", (unsigned long long) off, (unsigned long long) off, len);
        /* check if requested area fits in superblock buffer */
        if (off + len <= SB_BUFFER_SIZE) {
                if (id->sbbuf == NULL) {
@@ -193,7 +193,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
                /* check if we need to read */
                if ((off + len) > id->sbbuf_len) {
-                       dbg("read sbbuf len:0x%llx", (unsigned long long) (off + len));
+                       info("read sbbuf len:0x%llx", (unsigned long long) (off + len));
                        if (lseek(id->fd, 0, SEEK_SET) < 0) {
                                dbg("lseek failed (%s)", strerror(errno));
                                return NULL;
@@ -229,7 +229,7 @@ uint8_t *volume_id_get_buffer(struct volume_id *id, uint64_t off, size_t len)
 
                /* check if we need to read */
                if ((off < id->seekbuf_off) || ((off + len) > (id->seekbuf_off + id->seekbuf_len))) {
-                       dbg("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len);
+                       info("read seekbuf off:0x%llx len:0x%zx", (unsigned long long) off, len);
                        if (lseek(id->fd, off, SEEK_SET) < 0) {
                                dbg("lseek failed (%s)", strerror(errno));
                                return NULL;

diff --git a/extras/volume_id/lib/vxfs.c b/extras/volume_id/lib/vxfs.c
index d10cc377621146653b18211e6af1cd85f283f97b..112666192cf1f54d914c7d6fc3a61d000502add1 100644 (file)
--- a/extras/volume_id/lib/vxfs.c
+++ b/extras/volume_id/lib/vxfs.c
@@ -37,7 +37,7 @@ int volume_id_probe_vxfs(struct volume_id *id, uint64_t off)
 {
        struct vxfs_super *vxs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        vxs = (struct vxfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200);
        if (vxs == NULL)

diff --git a/extras/volume_id/lib/xfs.c b/extras/volume_id/lib/xfs.c
index 3d870c41e73ca724ab8fa0346413668b943714a7..9228fe4c887c86e035b8f811db6266462ed173fe 100644 (file)
--- a/extras/volume_id/lib/xfs.c
+++ b/extras/volume_id/lib/xfs.c
@@ -45,7 +45,7 @@ int volume_id_probe_xfs(struct volume_id *id, uint64_t off)
 {
        struct xfs_super_block *xs;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx", (unsigned long long) off);
 
        xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200);
        if (xs == NULL)