get rid of udev_sysdeps.c

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

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 5d95b502e37458bbc4efaaefe8a14ff1c404a411..f7d1af4fe73379b71b67906f0ab5a575ca52a40b 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     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.
+ * 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, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -26,7 +31,6 @@
 
 #include "libvolume_id.h"
 #include "libvolume_id-private.h"
-#include "util.h"
 
 struct mdp0_super_block {
        uint32_t        md_magic;
@@ -149,26 +153,31 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
 {
        uint64_t sboff;
 
-       /* version 0 at the end of the device */
-       sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
-       if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
-               return 0;
-
-       /* version 1.0 at the end of the device */
-       sboff = (size & ~(0x1000 - 1)) - 0x2000;
-       if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
-               strcpy(id->type_version, "1.0");
+       if (size > MD_RESERVED_BYTES) {
+               /* version 0 at the end of the device */
+               sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+               if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
+                       return 0;
+
+               /* version 1.0 at the end of the device */
+               sboff = (size & ~(0x1000 - 1)) - 0x2000;
+               if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) {
+                       strcpy(id->type_version, "1.0");
+                       return 0;
+               }
+       }
 
        /* version 1.1 at the start of the device */
-       else if (volume_id_probe_linux_raid1(id, off, size) == 0)
+       if (volume_id_probe_linux_raid1(id, off, size) == 0) {
                strcpy(id->type_version, "1.1");
+               return 0;
+       }
 
        /* version 1.2 at 4k offset from the start */
-       else if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+       if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
                strcpy(id->type_version, "1.2");
+               return 0;
+       }
 
-       else
-               return -1;
-
-       return 0;
+       return -1;
 }