summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Marek2011-09-01 14:16:21 +0200
committerKarel Zak2011-09-07 07:58:16 +0200
commit8f2b1e841102ff76811ff0dba41778844d17c501 (patch)
tree7f0e20b8c3b9cc3c61fe89890cc84c1e6517a09b
parentlibuuid: add limits.h include for OPEN_MAX (diff)
downloadkernel-qcow2-util-linux-8f2b1e841102ff76811ff0dba41778844d17c501.tar.gz
kernel-qcow2-util-linux-8f2b1e841102ff76811ff0dba41778844d17c501.tar.xz
kernel-qcow2-util-linux-8f2b1e841102ff76811ff0dba41778844d17c501.zip
libblkid: new magic for 8.4 style (unclean) activity log.
Signed-off-by: Philipp Marek <philipp.marek@linbit.com>
-rw-r--r--libblkid/src/superblocks/drbd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index 1e404069b..43e544e89 100644
--- a/libblkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
@@ -27,7 +27,8 @@
* user/drbdmeta.c
* We only support v08 for now
*/
-#define DRBD_MD_MAGIC_08 (DRBD_MAGIC+4)
+#define DRBD_MD_MAGIC_08 (DRBD_MAGIC+4)
+#define DRBD_MD_MAGIC_84_UNCLEAN (DRBD_MAGIC+5)
/*
* drbd/linux/drbd.h
@@ -83,7 +84,8 @@ static int probe_drbd(blkid_probe pr,
if (!md)
return -1;
- if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08)
+ if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08 &&
+ be32_to_cpu(md->magic) != DRBD_MD_MAGIC_84_UNCLEAN)
return -1;
/*