* %End-Header%
*/
+#include "config.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
+#ifdef __linux__
#include <sys/utsname.h>
+#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
while ((*end == ' ' || *end == 0) && end >= label)
--end;
- if (end >= label) {
- label = label;
+ if (end >= label)
return end - label + 1;
- }
return 0;
}
-static unsigned char *get_buffer(struct blkid_probe *pr,
+static unsigned char *get_buffer(struct blkid_probe *pr,
blkid_loff_t off, size_t len)
{
ssize_t ret_read;
struct mdp_superblock_s *md;
blkid_loff_t offset;
char buf[4096];
-
+
if (fd < 0)
return -BLKID_ERR_PARAM;
struct ext2_super_block *es = (struct ext2_super_block *) buf;
const char *label = 0;
- DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n",
+ DBG(DEBUG_PROBE, printf("ext2_sb.compat = %08X:%08X:%08X\n",
blkid_le32(es->s_feature_compat),
blkid_le32(es->s_feature_incompat),
blkid_le32(es->s_feature_ro_compat)));
*/
static int check_for_modules(const char *fs_name)
{
+#ifdef __linux__
struct utsname uts;
FILE *f;
- char buf[1024], *cp, *t;
- int i;
+ char buf[1024], *cp;
+ int namesz;
if (uname(&uts))
return (0);
f = fopen(buf, "r");
if (!f)
return (0);
+
+ namesz = strlen(fs_name);
+
while (!feof(f)) {
if (!fgets(buf, sizeof(buf), f))
break;
continue;
if ((cp = strrchr(buf, '/')) != NULL)
cp++;
- i = strlen(cp);
- if (i > 3) {
- t = cp + i - 3;
- if (!strcmp(t, ".ko"))
- *t = 0;
- }
- if (!strcmp(cp, fs_name))
+ else
+ cp = buf;
+ if (!strncmp(cp, fs_name, namesz) &&
+ (!strcmp(cp + namesz, ".ko") ||
+ !strcmp(cp + namesz, ".ko.gz"))) {
+ fclose(f);
return (1);
+ }
}
fclose(f);
+#endif
return (0);
}
+static int linux_version_code(void)
+{
+#ifdef __linux__
+ struct utsname ut;
+ static int version_code = -1;
+ int major, minor, rev;
+ char *endptr;
+ const char *cp;
+
+ if (version_code > 0)
+ return version_code;
+
+ if (uname(&ut))
+ return 0;
+ cp = ut.release;
+
+ major = strtol(cp, &endptr, 10);
+ if (cp == endptr || *endptr != '.')
+ return 0;
+ cp = endptr + 1;
+ minor = strtol(cp, &endptr, 10);
+ if (cp == endptr || *endptr != '.')
+ return 0;
+ cp = endptr + 1;
+ rev = strtol(cp, &endptr, 10);
+ if (cp == endptr)
+ return 0;
+ version_code = (((major * 256) + minor) * 256) + rev;
+ return version_code;
+#else
+ return 0;
+#endif
+}
+
+#define EXT4_SUPPORTS_EXT2 (2 * 65536 + 6*256 + 29)
+
+static int system_supports_ext2(void)
+{
+ static time_t last_check = 0;
+ static int ret = -1;
+ time_t now = time(0);
+
+ if (ret != -1 || (now - last_check) < 5)
+ return ret;
+ last_check = now;
+ ret = (fs_proc_check("ext2") || check_for_modules("ext2"));
+ return ret;
+}
+
static int system_supports_ext4(void)
{
static time_t last_check = 0;
static int ret = -1;
time_t now = time(0);
- if (ret != -1 || (last_check - now) < 5)
+ if (ret != -1 || (now - last_check) < 5)
return ret;
last_check = now;
ret = (fs_proc_check("ext4") || check_for_modules("ext4"));
static int ret = -1;
time_t now = time(0);
- if (ret != -1 || (last_check - now) < 5)
+ if (ret != -1 || (now - last_check) < 5)
return ret;
last_check = now;
ret = (fs_proc_check("ext4dev") || check_for_modules("ext4dev"));
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
return -BLKID_ERR_PARAM;
- /* ext4dev requires a journal */
+ /*
+ * If the filesystem does not have a journal and ext2 and ext4
+ * is not present, then force this to be detected as an
+ * ext4dev filesystem.
+ */
if (!(blkid_le32(es->s_feature_compat) &
- EXT3_FEATURE_COMPAT_HAS_JOURNAL))
- return -BLKID_ERR_PARAM;
+ EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
+ !system_supports_ext2() && !system_supports_ext4() &&
+ system_supports_ext4dev() &&
+ linux_version_code() >= EXT4_SUPPORTS_EXT2)
+ goto force_ext4dev;
/*
* If the filesystem is marked as OK for use by in-development
} else
return -BLKID_ERR_PARAM;
+force_ext4dev:
get_ext2_info(probe->dev, id, buf);
return 0;
}
es = (struct ext2_super_block *)buf;
/* Distinguish from jbd */
- if (blkid_le32(es->s_feature_incompat) &
+ if (blkid_le32(es->s_feature_incompat) &
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
return -BLKID_ERR_PARAM;
- /* ext4 requires journal */
+ /*
+ * If the filesystem does not have a journal and ext2 is not
+ * present, then force this to be detected as an ext2
+ * filesystem.
+ */
if (!(blkid_le32(es->s_feature_compat) &
- EXT3_FEATURE_COMPAT_HAS_JOURNAL))
- return -BLKID_ERR_PARAM;
+ EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
+ !system_supports_ext2() && system_supports_ext4() &&
+ linux_version_code() >= EXT4_SUPPORTS_EXT2)
+ goto force_ext4;
/* Ext4 has at least one feature which ext3 doesn't understand */
if (!(blkid_le32(es->s_feature_ro_compat) &
EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
return -BLKID_ERR_PARAM;
+force_ext4:
/*
* If the filesystem is a OK for use by in-development
* filesystem code, and ext4dev is supported or ext4 is not
struct ext2_super_block *es;
es = (struct ext2_super_block *)buf;
- /* Distinguish from ext4dev */
- if (blkid_le32(es->s_flags) & EXT2_FLAGS_TEST_FILESYS)
- return -BLKID_ERR_PARAM;
-
/* ext3 requires journal */
if (!(blkid_le32(es->s_feature_compat) &
EXT3_FEATURE_COMPAT_HAS_JOURNAL))
EXT2_FEATURE_INCOMPAT_UNSUPPORTED))
return -BLKID_ERR_PARAM;
+ /*
+ * If ext2 is not present, but ext4 or ext4dev are, then
+ * disclaim we are ext2
+ */
+ if (!system_supports_ext2() &&
+ (system_supports_ext4() || system_supports_ext4dev()) &&
+ linux_version_code() >= EXT4_SUPPORTS_EXT2)
+ return -BLKID_ERR_PARAM;
+
get_ext2_info(probe->dev, id, buf);
return 0;
}
for (i = 0; i < count; i++) {
if (dir[i].name[0] == 0x00)
break;
-
+
if ((dir[i].name[0] == FAT_ENTRY_FREE) ||
(dir[i].cluster_high != 0 || dir[i].cluster_low != 0) ||
((dir[i].attr & FAT_ATTR_MASK) == FAT_ATTR_LONG_NAME))
continue;
- if ((dir[i].attr & (FAT_ATTR_VOLUME_ID | FAT_ATTR_DIR)) ==
+ if ((dir[i].attr & (FAT_ATTR_VOLUME_ID | FAT_ATTR_DIR)) ==
FAT_ATTR_VOLUME_ID) {
return dir[i].name;
}
/* FAT label extraction from the root directory taken from Kay
* Sievers's volume_id library */
static int probe_fat(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct vfat_super_block *vs = (struct vfat_super_block *) buf;
if (ms->ms_fat_length) {
/* the label may be an attribute in the root directory */
root_start = (reserved + fat_size) * sector_size;
- root_dir_entries = vs->vs_dir_entries[0] +
+ root_dir_entries = vs->vs_dir_entries[0] +
(vs->vs_dir_entries[1] << 8);
buf_size = root_dir_entries * sizeof(struct vfat_dir_entry);
- dir = (struct vfat_dir_entry *) get_buffer(probe, root_start,
+ dir = (struct vfat_dir_entry *) get_buffer(probe, root_start,
buf_size);
if (dir)
vol_label = search_fat_label(dir, root_dir_entries);
vol_label = ms->ms_label;
vol_serno = ms->ms_serno;
- blkid_set_tag(probe->dev, "SEC_TYPE", "msdos",
+ blkid_set_tag(probe->dev, "SEC_TYPE", "msdos",
sizeof("msdos"));
} else {
/* Search the FAT32 root dir for the label attribute */
int count;
next_sect_off = (next - 2) * vs->vs_cluster_size;
- next_off = (start_data_sect + next_sect_off) *
+ next_off = (__u64) (start_data_sect + next_sect_off) *
sector_size;
- dir = (struct vfat_dir_entry *)
+ dir = (struct vfat_dir_entry *)
get_buffer(probe, next_off, buf_size);
if (dir == NULL)
break;
break;
/* get FAT entry */
- fat_entry_off = (reserved * sector_size) +
+ fat_entry_off =
+ ((unsigned int) reserved *
+ (unsigned int) sector_size) +
(next * sizeof(__u32));
buf = get_buffer(probe, fat_entry_off, buf_size);
if (buf == NULL)
* [7-Jul-2005, Karel Zak <kzak@redhat.com>]
*/
static int probe_fat_nomagic(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct msdos_super_block *ms;
if (ms->ms_heads == 0)
return 1;
- /* cluster size check*/
+ /* cluster size check*/
if (ms->ms_cluster_size == 0 ||
(ms->ms_cluster_size & (ms->ms_cluster_size-1)))
return 1;
}
static int probe_ntfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct ntfs_super_block *ns;
if (ns->cluster_per_mft_record < 0)
mft_record_size = 1 << (0-ns->cluster_per_mft_record);
else
- mft_record_size = ns->cluster_per_mft_record *
+ mft_record_size = ns->cluster_per_mft_record *
sectors_per_cluster * bytes_per_sector;
nr_clusters = blkid_le64(ns->number_of_sectors) / sectors_per_cluster;
(blkid_le64(ns->mft_mirror_cluster_location) > nr_clusters))
return 1;
- off = blkid_le64(ns->mft_mirror_cluster_location) *
+ off = blkid_le64(ns->mft_mirror_cluster_location) *
bytes_per_sector * sectors_per_cluster;
buf_mft = get_buffer(probe, off, mft_record_size);
if (memcmp(buf_mft, "FILE", 4))
return 1;
- off = blkid_le64(ns->mft_cluster_location) * bytes_per_sector *
+ off = blkid_le64(ns->mft_cluster_location) * bytes_per_sector *
sectors_per_cluster;
buf_mft = get_buffer(probe, off, mft_record_size);
attr_off = blkid_le16(mft->attrs_offset);
label_str[0] = 0;
-
+
while (1) {
attr = (struct file_attribute *) (buf_mft + attr_off);
attr_len = blkid_le16(attr->len);
static int probe_xfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct xfs_super_block *xs;
}
static int probe_reiserfs4(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct reiser4_super_block *rs4 = (struct reiser4_super_block *) buf;
if (strlen((char *) rs4->rs4_label))
label = rs4->rs4_label;
set_uuid(probe->dev, rs4->rs4_uuid, 0);
- blkid_set_tag(probe->dev, "LABEL", (const char *) label,
+ blkid_set_tag(probe->dev, "LABEL", (const char *) label,
sizeof(rs4->rs4_label));
return 0;
}
static int probe_jfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct jfs_super_block *js;
}
static int probe_romfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct romfs_super_block *ros;
}
static int probe_cramfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct cramfs_super_block *csb;
/* arbitrary sanity check.. is there any garbage down there? */
if (sws->sws_pad[32] == 0 && sws->sws_pad[33] == 0) {
if (sws->sws_volume[0])
- blkid_set_tag(probe->dev, "LABEL", sws->sws_volume,
+ blkid_set_tag(probe->dev, "LABEL", sws->sws_volume,
sizeof(sws->sws_volume));
if (sws->sws_uuid[0])
set_uuid(probe->dev, sws->sws_uuid, 0);
}
static int probe_iso9660(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct iso_volume_descriptor *iso;
iso = (struct iso_volume_descriptor *) buf;
label = iso->volume_id;
- blkid_set_tag(probe->dev, "LABEL", (const char *) label,
+ blkid_set_tag(probe->dev, "LABEL", (const char *) label,
figure_label_len(label, 32));
return 0;
}
"NSR03", "TEA01", 0 };
static int probe_udf(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf __BLKID_ATTR((unused)))
{
int j, bs;
/* determine the block size by scanning in 2K increments
(block sizes larger than 2K will be null padded) */
for (bs = 1; bs < 16; bs++) {
- isosb = (struct iso_volume_descriptor *)
- get_buffer(probe, bs*2048+32768, sizeof(isosb));
+ isosb = (struct iso_volume_descriptor *)
+ get_buffer(probe, (blkid_loff_t) bs*2048+32768,
+ sizeof(*isosb));
if (!isosb)
return 1;
if (isosb->vd_id[0])
/* Scan up to another 64 blocks looking for additional VSD's */
for (j = 1; j < 64; j++) {
if (j > 1) {
- isosb = (struct iso_volume_descriptor *)
- get_buffer(probe, j*bs*2048+32768,
- sizeof(isosb));
+ isosb = (struct iso_volume_descriptor *)
+ get_buffer(probe, j*bs*2048+32768,
+ sizeof(*isosb));
if (!isosb)
return 1;
}
}
static int probe_ocfs(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct ocfs_volume_header ovh;
blkid_set_tag(probe->dev,"SEC_TYPE","ocfs1",sizeof("ocfs1"));
else if (major >= 9)
blkid_set_tag(probe->dev,"SEC_TYPE","ntocfs",sizeof("ntocfs"));
-
+
blkid_set_tag(probe->dev, "LABEL", ovl.label, ocfslabellen(ovl));
blkid_set_tag(probe->dev, "MOUNT", ovh.mount, ocfsmountlen(ovh));
set_uuid(probe->dev, ovl.vol_id, 0);
}
static int probe_ocfs2(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct ocfs2_super_block *osb;
}
static int probe_oracleasm(struct blkid_probe *probe,
- struct blkid_magic *id __BLKID_ATTR((unused)),
+ struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
struct oracle_asm_disk_label *dl;
if (blkid_be32(sbd->sb_fs_format) == GFS_FORMAT_FS &&
blkid_be32(sbd->sb_multihost_format) == GFS_FORMAT_MULTI)
- {
+ {
blkid_set_tag(probe->dev, "UUID", 0, 0);
-
+
if (strlen(sbd->sb_locktable))
label = sbd->sb_locktable;
blkid_set_tag(probe->dev, "LABEL", label, sizeof(sbd->sb_locktable));
if (blkid_be32(sbd->sb_fs_format) == GFS2_FORMAT_FS &&
blkid_be32(sbd->sb_multihost_format) == GFS2_FORMAT_MULTI)
- {
+ {
blkid_set_tag(probe->dev, "UUID", 0, 0);
-
+
if (strlen(sbd->sb_locktable))
label = sbd->sb_locktable;
blkid_set_tag(probe->dev, "LABEL", label, sizeof(sbd->sb_locktable));
return 1;
}
-void unicode_16be_to_utf8(unsigned char *str, int out_len,
- const unsigned char *buf, int in_len)
+static void unicode_16be_to_utf8(unsigned char *str, int out_len,
+ const unsigned char *buf, int in_len)
{
int i, j;
unsigned int c;
struct blkid_magic *id __BLKID_ATTR((unused)),
unsigned char *buf)
{
- struct hfs_mdb *hfs = (struct hfs_mdb *) buf;
+ struct hfs_mdb *hfs = (struct hfs_mdb *)buf;
+ unsigned long long *uuid_ptr;
char uuid_str[17];
__u64 uuid;
(memcmp(hfs->embed_sig, "HX", 2) == 0))
return 1; /* Not hfs, but an embedded HFS+ */
- uuid = blkid_le64(*((unsigned long long *) hfs->finder_info.id));
+ uuid_ptr = (unsigned long long *)hfs->finder_info.id;
+ uuid = blkid_le64(*uuid_ptr);
if (uuid) {
sprintf(uuid_str, "%016llX", uuid);
blkid_set_tag(probe->dev, "UUID", uuid_str, 0);
}
- blkid_set_tag(probe->dev, "LABEL", hfs->label, hfs->label_len);
+ blkid_set_tag(probe->dev, "LABEL", (char *)hfs->label, hfs->label_len);
return 0;
}
unsigned int leaf_node_size;
unsigned int leaf_block;
unsigned int label_len;
- int ext;
+ unsigned long long *uuid_ptr;
__u64 leaf_off, uuid;
char uuid_str[17], label[512];
+ int ext;
/* Check for a HFS+ volume embedded in a HFS volume */
if (memcmp(sbd->signature, "BD", 2) == 0) {
(memcmp(sbd->embed_sig, "HX", 2) != 0))
/* This must be an HFS volume, so fail */
return 1;
-
+
alloc_block_size = blkid_be32(sbd->al_blk_size);
alloc_first_block = blkid_be16(sbd->al_bl_st);
embed_first_block = blkid_be16(sbd->embed_startblock);
off = (alloc_first_block * 512) +
(embed_first_block * alloc_block_size);
buf = get_buffer(probe, off + (id->bim_kboff * 1024),
- sizeof(sbd));
+ sizeof(*sbd));
if (!buf)
return 1;
(memcmp(hfsplus->signature, "HX", 2) != 0))
return 1;
- uuid = blkid_le64(*((unsigned long long *) hfsplus->finder_info.id));
+ uuid_ptr = (unsigned long long *)hfsplus->finder_info.id;
+ uuid = blkid_le64(*uuid_ptr);
if (uuid) {
sprintf(uuid_str, "%016llX", uuid);
blkid_set_tag(probe->dev, "UUID", uuid_str, 0);
memcpy(extents, hfsplus->cat_file.extents, sizeof(extents));
cat_block = blkid_be32(extents[0].start_block);
- buf = get_buffer(probe, off + (cat_block * blocksize), 0x2000);
+ buf = get_buffer(probe, off + ((__u64) cat_block * blocksize), 0x2000);
if (!buf)
return 0;
if (ext == HFSPLUS_EXTENT_COUNT)
return 0;
- leaf_off = (ext_block_start + leaf_block) * blocksize;
+ leaf_off = (__u64) (ext_block_start + leaf_block) * blocksize;
buf = get_buffer(probe, off + leaf_off, leaf_node_size);
if (!buf)
return 0;
label_len = blkid_be16(key->unicode_len) * 2;
- unicode_16be_to_utf8(label, sizeof(label), key->unicode, label_len);
+ unicode_16be_to_utf8((unsigned char *)label, sizeof(label),
+ key->unicode, label_len);
blkid_set_tag(probe->dev, "LABEL", label, 0);
return 0;
}
return 1;
}
- for (i=0, b=1, p=uuid, q= (char *) label->pv_uuid; i <= 32;
+ for (i=0, b=1, p=uuid, q= (char *) label->pv_uuid; i < LVM2_ID_LEN;
i++, b <<= 1) {
if (b & 0x4444440)
*p++ = '-';
return 0;
}
+
+static int probe_btrfs(struct blkid_probe *probe,
+ struct blkid_magic *id,
+ unsigned char *buf)
+{
+ struct btrfs_super_block *bs;
+ const char *label = 0;
+
+ bs = (struct btrfs_super_block *)buf;
+
+ if (strlen(bs->label))
+ label = bs->label;
+ blkid_set_tag(probe->dev, "LABEL", label, sizeof(bs->label));
+ set_uuid(probe->dev, bs->fsid, 0);
+ return 0;
+}
/*
* Various filesystem magics that we can check for. Note that kboff and
* sboff are in kilobytes and bytes respectively. All magics are in
{ "iso9660", 32, 1, 5, "CD001", probe_iso9660 },
{ "iso9660", 32, 9, 5, "CDROM", probe_iso9660 },
{ "jfs", 32, 0, 4, "JFS1", probe_jfs },
- { "zfs", 8, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
- { "zfs", 8, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
- { "zfs", 264, 0, 8, "\0\0\x02\xf5\xb0\x07\xb1\x0c", probe_zfs },
- { "zfs", 264, 0, 8, "\x0c\xb1\x07\xb0\xf5\x02\0\0", probe_zfs },
+ /* ZFS has 128 root blocks (#4 is the first used), check only 6 of them */
+ { "zfs", 128, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 128, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
+ { "zfs", 132, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 132, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
+ { "zfs", 136, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 136, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
+ { "zfs", 384, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 384, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
+ { "zfs", 388, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 388, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
+ { "zfs", 392, 0, 8, "\0\0\0\0\0\xba\xb1\x0c", probe_zfs },
+ { "zfs", 392, 0, 8, "\x0c\xb1\xba\0\0\0\0\0", probe_zfs },
{ "hfsplus", 1, 0, 2, "BD", probe_hfsplus },
{ "hfsplus", 1, 0, 2, "H+", probe_hfsplus },
{ "hfsplus", 1, 0, 2, "HX", probe_hfsplus },
{ "swap", 0, 0xff6, 10, "SWAPSPACE2", probe_swap1 },
{ "swsuspend", 0, 0xff6, 9, "S1SUSPEND", probe_swap1 },
{ "swsuspend", 0, 0xff6, 9, "S2SUSPEND", probe_swap1 },
+ { "swsuspend", 0, 0xff6, 9, "ULSUSPEND", probe_swap1 },
{ "swap", 0, 0x1ff6, 10, "SWAP-SPACE", probe_swap0 },
{ "swap", 0, 0x1ff6, 10, "SWAPSPACE2", probe_swap1 },
{ "swsuspend", 0, 0x1ff6, 9, "S1SUSPEND", probe_swap1 },
{ "swsuspend", 0, 0x1ff6, 9, "S2SUSPEND", probe_swap1 },
+ { "swsuspend", 0, 0x1ff6, 9, "ULSUSPEND", probe_swap1 },
{ "swap", 0, 0x3ff6, 10, "SWAP-SPACE", probe_swap0 },
{ "swap", 0, 0x3ff6, 10, "SWAPSPACE2", probe_swap1 },
{ "swsuspend", 0, 0x3ff6, 9, "S1SUSPEND", probe_swap1 },
{ "swsuspend", 0, 0x3ff6, 9, "S2SUSPEND", probe_swap1 },
+ { "swsuspend", 0, 0x3ff6, 9, "ULSUSPEND", probe_swap1 },
{ "swap", 0, 0x7ff6, 10, "SWAP-SPACE", probe_swap0 },
{ "swap", 0, 0x7ff6, 10, "SWAPSPACE2", probe_swap1 },
{ "swsuspend", 0, 0x7ff6, 9, "S1SUSPEND", probe_swap1 },
{ "swsuspend", 0, 0x7ff6, 9, "S2SUSPEND", probe_swap1 },
+ { "swsuspend", 0, 0x7ff6, 9, "ULSUSPEND", probe_swap1 },
{ "swap", 0, 0xfff6, 10, "SWAP-SPACE", probe_swap0 },
{ "swap", 0, 0xfff6, 10, "SWAPSPACE2", probe_swap1 },
{ "swsuspend", 0, 0xfff6, 9, "S1SUSPEND", probe_swap1 },
{ "swsuspend", 0, 0xfff6, 9, "S2SUSPEND", probe_swap1 },
+ { "swsuspend", 0, 0xfff6, 9, "ULSUSPEND", probe_swap1 },
{ "ocfs", 0, 8, 9, "OracleCFS", probe_ocfs },
{ "ocfs2", 1, 0, 6, "OCFSV2", probe_ocfs2 },
{ "ocfs2", 2, 0, 6, "OCFSV2", probe_ocfs2 },
{ "lvm2pv", 0, 0x018, 8, "LVM2 001", probe_lvm2 },
{ "lvm2pv", 1, 0x018, 8, "LVM2 001", probe_lvm2 },
{ "lvm2pv", 1, 0x218, 8, "LVM2 001", probe_lvm2 },
+ { "btrfs", 64, 0x40, 8, "_BHRfS_M", probe_btrfs },
{ NULL, 0, 0, 0, NULL, NULL }
};
if ((now >= dev->bid_time) &&
(st.st_mtime <= dev->bid_time) &&
- ((diff < BLKID_PROBE_MIN) ||
+ ((diff < BLKID_PROBE_MIN) ||
(dev->bid_flags & BLKID_BID_FL_VERIFIED &&
diff < BLKID_PROBE_INTERVAL)))
return dev;
if ((probe.fd = open(dev->bid_name, O_RDONLY)) < 0) {
DBG(DEBUG_PROBE, printf("blkid_verify: error %s (%d) while "
- "opening %s\n", strerror(errno), errno,
+ "opening %s\n", strerror(errno), errno,
dev->bid_name));
goto open_err;
}
probe.sbbuf = 0;
probe.buf = 0;
probe.buf_max = 0;
-
+
/*
* Iterate over the type array. If we already know the type,
* then try that first. If it doesn't work, then blow away
* the type information, and try again.
- *
+ *
*/
try_again:
type = 0;
continue;
idx = id->bim_kboff + (id->bim_sboff >> 10);
- buf = get_buffer(&probe, idx << 10, 1024);
+ buf = get_buffer(&probe, (__u64) idx << 10, 1024);
if (!buf)
continue;
dev->bid_name, (long long)st.st_rdev, type));
}
- if (probe.sbbuf)
- free(probe.sbbuf);
- if (probe.buf)
- free(probe.buf);
- if (probe.fd >= 0)
+ free(probe.sbbuf);
+ free(probe.buf);
+ if (probe.fd >= 0)
close(probe.fd);
return dev;
printf("LABEL='%s'\n", dev->bid_label);
if (dev->bid_uuid)
printf("UUID='%s'\n", dev->bid_uuid);
-
+
blkid_free_dev(dev);
return (0);
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff