switch tools and volume_id from LGPL to GPLv2

[elogind.git] / extras / volume_id / volume_id / linux_raid.c

diff --git a/extras/volume_id/volume_id/linux_raid.c b/extras/volume_id/volume_id/linux_raid.c
index e7db4031de74810b5754f2e6dcd78fd21ced318e..eb37dba3671a8fe1267dd03b604243099c409520 100644 (file)
--- a/extras/volume_id/volume_id/linux_raid.c
+++ b/extras/volume_id/volume_id/linux_raid.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -32,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,34 +29,35 @@
 #include "linux_raid.h"
 
 struct mdp_super_block {
-       __u32   md_magic;
-       __u32   major_version;
-       __u32   minor_version;
-       __u32   patch_version;
-       __u32   gvalid_words;
-       __u32   set_uuid0;
-       __u32   ctime;
-       __u32   level;
-       __u32   size;
-       __u32   nr_disks;
-       __u32   raid_disks;
-       __u32   md_minor;
-       __u32   not_persistent;
-       __u32   set_uuid1;
-       __u32   set_uuid2;
-       __u32   set_uuid3;
+       uint32_t        md_magic;
+       uint32_t        major_version;
+       uint32_t        minor_version;
+       uint32_t        patch_version;
+       uint32_t        gvalid_words;
+       uint32_t        set_uuid0;
+       uint32_t        ctime;
+       uint32_t        level;
+       uint32_t        size;
+       uint32_t        nr_disks;
+       uint32_t        raid_disks;
+       uint32_t        md_minor;
+       uint32_t        not_persistent;
+       uint32_t        set_uuid1;
+       uint32_t        set_uuid2;
+       uint32_t        set_uuid3;
 } __attribute__((packed)) *mdp;
 
 #define MD_RESERVED_BYTES              0x10000
 #define MD_MAGIC                       0xa92b4efc
 
-int volume_id_probe_linux_raid(struct volume_id *id, __u64 off, __u64 size)
+int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-       const __u8 *buf;
-       __u64 sboff;
-       __u8 uuid[16];
+       const uint8_t *buf;
+       uint64_t sboff;
+       uint8_t uuid[16];
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       dbg("probing at offset 0x%llx, size 0x%llx",
+           (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)
                return -1;
@@ -86,7 +76,7 @@ int volume_id_probe_linux_raid(struct volume_id *id, __u64 off, __u64 size)
        memcpy(&uuid[4], &mdp->set_uuid1, 12);
        volume_id_set_uuid(id, uuid, UUID_DCE);
 
-       snprintf(id->type_version, VOLUME_ID_FORMAT_SIZE-1, "%u.%u.%u",
+       snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                 le32_to_cpu(mdp->major_version),
                 le32_to_cpu(mdp->minor_version),
                 le32_to_cpu(mdp->patch_version));