diff options
Diffstat (limited to 'extras')
-rw-r--r-- | extras/volume_id/volume_id/Makefile.inc | 2 | ||||
-rw-r--r-- | extras/volume_id/volume_id/volume_id.c | 3 | ||||
-rw-r--r-- | extras/volume_id/volume_id/vxfs.c | 56 | ||||
-rw-r--r-- | extras/volume_id/volume_id/vxfs.h | 16 |
4 files changed, 77 insertions, 0 deletions
diff --git a/extras/volume_id/volume_id/Makefile.inc b/extras/volume_id/volume_id/Makefile.inc index 80f451d583..6f8dceea4a 100644 --- a/extras/volume_id/volume_id/Makefile.inc +++ b/extras/volume_id/volume_id/Makefile.inc @@ -28,6 +28,7 @@ VOLUME_ID_OBJS= \ $(VOLUME_ID_BASE)/minix.o \ $(VOLUME_ID_BASE)/luks.o \ $(VOLUME_ID_BASE)/ocfs.o \ + $(VOLUME_ID_BASE)/vxfs.o \ $(VOLUME_ID_BASE)/volume_id.o \ $(VOLUME_ID_BASE)/util.o @@ -60,5 +61,6 @@ VOLUME_ID_HEADERS= \ $(VOLUME_ID_BASE)/minix.h \ $(VOLUME_ID_BASE)/luks.h \ $(VOLUME_ID_BASE)/ocfs.h \ + $(VOLUME_ID_BASE)/vxfs.h \ $(VOLUME_ID_BASE)/volume_id.h \ $(VOLUME_ID_BASE)/util.h diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c index 25bcd95358..06496e7130 100644 --- a/extras/volume_id/volume_id/volume_id.c +++ b/extras/volume_id/volume_id/volume_id.c @@ -162,6 +162,9 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) if (volume_id_probe_ocfs2(id, off) == 0) goto exit; + if (volume_id_probe_vxfs(id, off) == 0) + goto exit; + return -1; exit: diff --git a/extras/volume_id/volume_id/vxfs.c b/extras/volume_id/volume_id/vxfs.c new file mode 100644 index 0000000000..c4a9ace98f --- /dev/null +++ b/extras/volume_id/volume_id/vxfs.c @@ -0,0 +1,56 @@ +/* + * volume_id - reads filesystem label and uuid + * + * 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. + */ + +#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> +#include <string.h> +#include <errno.h> +#include <ctype.h> + +#include "volume_id.h" +#include "logging.h" +#include "util.h" +#include "vxfs.h" + +#define VXFS_SUPER_MAGIC 0xa501FCF5 + +struct vxfs_super { + uint32_t vs_magic; + int32_t vs_version; +} __attribute__((__packed__)); + +int volume_id_probe_vxfs(struct volume_id *id, uint64_t off) +{ + struct vxfs_super *vxs; + + dbg("probing at offset 0x%llx", (unsigned long long) off); + + vxs = (struct vxfs_super *) volume_id_get_buffer(id, off + 0x200, 0x200); + if (vxs == NULL) + return -1; + + if (vxs->vs_magic == cpu_to_le32(VXFS_SUPER_MAGIC)) { + snprintf(id->type_version, sizeof(id->type_version)-1, "%u", (unsigned int) vxs->vs_version); + volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); + id->type = "vxfs"; + return 0; + } + + return -1; +} diff --git a/extras/volume_id/volume_id/vxfs.h b/extras/volume_id/volume_id/vxfs.h new file mode 100644 index 0000000000..8ca45c3fdc --- /dev/null +++ b/extras/volume_id/volume_id/vxfs.h @@ -0,0 +1,16 @@ +/* + * volume_id - reads filesystem label and uuid + * + * Copyright (C) 2005 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. + */ + +#ifndef _VOLUME_ID_VXFS_ +#define _VOLUME_ID_VXFS_ + +extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off); + +#endif |