*
* Copyright (C) 2005 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
#include <ctype.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include <asm/types.h>
#include "volume_id.h"
#include "logging.h"
#include "util.h"
-#include "ext/ext.h"
-#include "reiserfs/reiserfs.h"
-#include "fat/fat.h"
-#include "hfs/hfs.h"
-#include "jfs/jfs.h"
-#include "xfs/xfs.h"
-#include "ufs/ufs.h"
-#include "ntfs/ntfs.h"
-#include "iso9660/iso9660.h"
-#include "udf/udf.h"
-#include "highpoint/highpoint.h"
-#include "linux_swap/linux_swap.h"
-#include "linux_raid/linux_raid.h"
-#include "lvm/lvm.h"
-#include "mac/mac.h"
-#include "msdos/msdos.h"
-
-int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned long long size)
+#include "ext.h"
+#include "reiserfs.h"
+#include "fat.h"
+#include "hfs.h"
+#include "jfs.h"
+#include "xfs.h"
+#include "ufs.h"
+#include "ntfs.h"
+#include "iso9660.h"
+#include "udf.h"
+#include "highpoint.h"
+#include "isw_raid.h"
+#include "lsi_raid.h"
+#include "via_raid.h"
+#include "silicon_raid.h"
+#include "nvidia_raid.h"
+#include "promise_raid.h"
+#include "luks.h"
+#include "linux_swap.h"
+#include "linux_raid.h"
+#include "lvm.h"
+#include "cramfs.h"
+#include "hpfs.h"
+#include "romfs.h"
+#include "sysv.h"
+#include "minix.h"
+#include "mac.h"
+#include "msdos.h"
+#include "ocfs.h"
+
+int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
{
if (id == NULL)
return -EINVAL;
/* probe for raid first, cause fs probes may be successful on raid members */
- if (volume_id_probe_linux_raid(id, off, size) == 0)
- goto exit;
+ if (size) {
+ if (volume_id_probe_linux_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_intel_software_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_lsi_mega_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_via_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_silicon_medley_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_nvidia_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_promise_fasttrack_raid(id, off, size) == 0)
+ goto exit;
+
+ if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
+ goto exit;
+ }
if (volume_id_probe_lvm1(id, off) == 0)
goto exit;
if (volume_id_probe_lvm2(id, off) == 0)
goto exit;
- if (volume_id_probe_highpoint_ataraid(id, off) == 0)
+ if (volume_id_probe_highpoint_37x_raid(id, off) == 0)
goto exit;
- /* signature in the first block, only small buffer needed */
- if (volume_id_probe_vfat(id, off) == 0)
+ if (volume_id_probe_luks(id, off) == 0)
goto exit;
- if (volume_id_probe_mac_partition_map(id, off) == 0)
+ /* signature in the first block, only small buffer needed */
+ if (volume_id_probe_vfat(id, off) == 0)
goto exit;
if (volume_id_probe_xfs(id, off) == 0)
if (volume_id_probe_ntfs(id, off) == 0)
goto exit;
+ if (volume_id_probe_cramfs(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_romfs(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_hpfs(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_sysv(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_minix(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_ocfs1(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_ocfs2(id, off) == 0)
+ goto exit;
+
+ if (volume_id_probe_vxfs(id, off) == 0)
+ goto exit;
+
return -1;
exit:
struct volume_id *volume_id_open_dev_t(dev_t devt)
{
struct volume_id *id;
- __u8 tmp_node[VOLUME_ID_PATH_MAX];
+ char tmp_node[VOLUME_ID_PATH_MAX];
snprintf(tmp_node, VOLUME_ID_PATH_MAX,
"/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));
- tmp_node[VOLUME_ID_PATH_MAX] = '\0';
+ tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
/* create tempory node to open the block device */
unlink(tmp_node);
~ianmdlvl / elogind.git / blobdiff