|
 |
531551 |
diff -up util-linux-2.23.2/libblkid/src/blkidP.h.kzak util-linux-2.23.2/libblkid/src/blkidP.h
|
|
|
531551 |
--- util-linux-2.23.2/libblkid/src/blkidP.h.kzak 2013-07-30 10:39:26.205738229 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/libblkid/src/blkidP.h 2014-01-23 10:51:10.109593273 +0100
|
|
|
531551 |
@@ -224,9 +224,6 @@ struct blkid_struct_probe
|
|
|
531551 |
|
|
|
531551 |
/* private per-probing flags */
|
|
|
531551 |
#define BLKID_PROBE_FL_IGNORE_PT (1 << 1) /* ignore partition table */
|
|
|
531551 |
-#define BLKID_PROBE_FL_IGNORE_BACKUP (1 << 2) /* ignore backup superblocks or PT */
|
|
|
531551 |
-
|
|
|
531551 |
-extern int blkid_probe_ignore_backup(blkid_probe pr);
|
|
|
531551 |
|
|
|
531551 |
extern blkid_probe blkid_clone_probe(blkid_probe parent);
|
|
|
531551 |
extern blkid_probe blkid_probe_get_wholedisk_probe(blkid_probe pr);
|
|
|
531551 |
diff -up util-linux-2.23.2/libblkid/src/probe.c.kzak util-linux-2.23.2/libblkid/src/probe.c
|
|
|
531551 |
--- util-linux-2.23.2/libblkid/src/probe.c.kzak 2013-07-30 10:39:26.208738259 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/libblkid/src/probe.c 2014-01-23 10:51:10.109593273 +0100
|
|
|
531551 |
@@ -924,7 +924,8 @@ int blkid_do_probe(blkid_probe pr)
|
|
|
531551 |
*
|
|
|
531551 |
* This function erases the current signature detected by @pr. The @pr has to
|
|
|
531551 |
* be open in O_RDWR mode, BLKID_SUBLKS_MAGIC or/and BLKID_PARTS_MAGIC flags
|
|
|
531551 |
- * has to be enabled.
|
|
|
531551 |
+ * has to be enabled (if you want to errase also superblock with broken check
|
|
|
531551 |
+ * sums then use BLKID_SUBLKS_BADCSUM too).
|
|
|
531551 |
*
|
|
|
531551 |
* After successful signature removing the @pr prober will be moved one step
|
|
|
531551 |
* back and the next blkid_do_probe() call will again call previously called
|
|
|
531551 |
@@ -1125,8 +1126,6 @@ int blkid_do_safeprobe(blkid_probe pr)
|
|
|
531551 |
|
|
|
531551 |
blkid_probe_start(pr);
|
|
|
531551 |
|
|
|
531551 |
- pr->prob_flags |= BLKID_PROBE_FL_IGNORE_BACKUP;
|
|
|
531551 |
-
|
|
|
531551 |
for (i = 0; i < BLKID_NCHAINS; i++) {
|
|
|
531551 |
struct blkid_chain *chn;
|
|
|
531551 |
|
|
|
531551 |
@@ -1764,8 +1763,3 @@ void blkid_probe_use_wiper(blkid_probe p
|
|
|
531551 |
blkid_probe_chain_reset_vals(pr, chn);
|
|
|
531551 |
}
|
|
|
531551 |
}
|
|
|
531551 |
-
|
|
|
531551 |
-int blkid_probe_ignore_backup(blkid_probe pr)
|
|
|
531551 |
-{
|
|
|
531551 |
- return pr && (pr->prob_flags & BLKID_PROBE_FL_IGNORE_BACKUP);
|
|
|
531551 |
-}
|
|
|
531551 |
diff -up util-linux-2.23.2/libblkid/src/superblocks/btrfs.c.kzak util-linux-2.23.2/libblkid/src/superblocks/btrfs.c
|
|
|
531551 |
--- util-linux-2.23.2/libblkid/src/superblocks/btrfs.c.kzak 2013-06-13 09:46:10.421650630 +0200
|
|
|
531551 |
+++ util-linux-2.23.2/libblkid/src/superblocks/btrfs.c 2014-01-23 10:51:10.109593273 +0100
|
|
|
531551 |
@@ -63,11 +63,6 @@ static int probe_btrfs(blkid_probe pr, c
|
|
|
531551 |
{
|
|
|
531551 |
struct btrfs_super_block *bfs;
|
|
|
531551 |
|
|
|
531551 |
- if (mag->kboff > 64 && blkid_probe_ignore_backup(pr)) {
|
|
|
531551 |
- DBG(LOWPROBE, blkid_debug("btrfs: found backup superblock, ignore"));
|
|
|
531551 |
- return 1;
|
|
|
531551 |
- }
|
|
|
531551 |
-
|
|
|
531551 |
bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block);
|
|
|
531551 |
if (!bfs)
|
|
|
531551 |
return -1;
|
|
|
531551 |
@@ -92,8 +87,6 @@ const struct blkid_idinfo btrfs_idinfo =
|
|
|
531551 |
.magics =
|
|
|
531551 |
{
|
|
|
531551 |
{ .magic = "_BHRfS_M", .len = 8, .sboff = 0x40, .kboff = 64 },
|
|
|
531551 |
- { .magic = "_BHRfS_M", .len = 8, .sboff = 0x40, .kboff = 64 * 1024 },
|
|
|
531551 |
- { .magic = "_BHRfS_M", .len = 8, .sboff = 0x40, .kboff = 256 * 1024 * 1024 },
|
|
|
531551 |
{ NULL }
|
|
|
531551 |
}
|
|
|
531551 |
};
|