From: Philipp Marek Date: Thu, 1 Sep 2011 12:16:21 +0000 (+0200) Subject: libblkid: new magic for 8.4 style (unclean) activity log. X-Git-Tag: v2.21-rc1~459 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f2b1e841102ff76811ff0dba41778844d17c501;p=thirdparty%2Futil-linux.git libblkid: new magic for 8.4 style (unclean) activity log. Signed-off-by: Philipp Marek --- diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c index 1e404069bd..43e544e896 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; /*