From 7b4c7a681cc4c0a53dc8a8baf4853e921cfbf5de Mon Sep 17 00:00:00 2001 From: bigbiff Date: Thu, 1 Jan 2015 19:44:14 -0500 Subject: Update blkid to 2.25.0 Break libblkid into 4 libraries: libblkid, libuuid, libutil-linux and libfdisk. This should help in later patch updates. Change-Id: I680d9a7feb031e5c29a603e9c58aff4b65826262 --- libblkid/highpoint_raid.c | 87 ----------------------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 libblkid/highpoint_raid.c (limited to 'libblkid/highpoint_raid.c') diff --git a/libblkid/highpoint_raid.c b/libblkid/highpoint_raid.c deleted file mode 100644 index 0b41344ae..000000000 --- a/libblkid/highpoint_raid.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2008 Karel Zak - * - * Inspired by libvolume_id by - * Kay Sievers - * - * This file may be redistributed under the terms of the - * GNU Lesser General Public License. - */ -#include -#include -#include -#include -#include - -#include "superblocks.h" - -struct hpt45x_metadata { - uint32_t magic; -}; - -#define HPT45X_MAGIC_OK 0x5a7816f3 -#define HPT45X_MAGIC_BAD 0x5a7816fd - -static int probe_highpoint45x(blkid_probe pr, - const struct blkid_idmag *mag __attribute__((__unused__))) -{ - struct hpt45x_metadata *hpt; - uint64_t off; - uint32_t magic; - - if (pr->size < 0x10000) - return -1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) - return -1; - - off = ((pr->size / 0x200) - 11) * 0x200; - hpt = (struct hpt45x_metadata *) - blkid_probe_get_buffer(pr, - off, - sizeof(struct hpt45x_metadata)); - if (!hpt) - return -1; - magic = le32_to_cpu(hpt->magic); - if (magic != HPT45X_MAGIC_OK && magic != HPT45X_MAGIC_BAD) - return -1; - if (blkid_probe_set_magic(pr, off, sizeof(hpt->magic), - (unsigned char *) &hpt->magic)) - return -1; - return 0; -} - -static int probe_highpoint37x(blkid_probe pr, - const struct blkid_idmag *mag __attribute__((__unused__))) -{ - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) - return -1; - return 0; -} - - -const struct blkid_idinfo highpoint45x_idinfo = { - .name = "hpt45x_raid_member", - .usage = BLKID_USAGE_RAID, - .probefunc = probe_highpoint45x, - .magics = BLKID_NONE_MAGIC -}; - -const struct blkid_idinfo highpoint37x_idinfo = { - .name = "hpt37x_raid_member", - .usage = BLKID_USAGE_RAID, - .probefunc = probe_highpoint37x, - .magics = { - /* - * Superblok offset: 4608 bytes (9 sectors) - * Magic string offset within superblock: 32 bytes - * - * kboff = (4608 + 32) / 1024 - * sboff = (4608 + 32) % kboff - */ - { .magic = "\xf0\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 }, - { .magic = "\xfd\x16\x78\x5a", .len = 4, .kboff = 4, .sboff = 544 }, - { NULL } - } -}; - - -- cgit v1.2.3