4 files changed, 40 insertions, 6 deletions

diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c
index 4ebaf1739..f3601864e 100644
--- a/libblkid/src/superblocks/drbd.c
+++ b/libblkid/src/superblocks/drbd.c
@@ -45,6 +45,13 @@ enum drbd_uuid_index {
 	UI_EXTENDED_SIZE	/* Everything. */
 };
 
+
+/*
+ * Used by libblkid to avoid unnecessary padding at the end of the structs and
+ * too large unused structs in memory.
+ */
+#define DRBD_MD_OFFSET 4096
+
 /*
  * user/shared/drbdmeta.c
  * Minor modifications wrt. types
@@ -63,7 +70,9 @@ struct md_on_disk_08 {
 	uint32_t bm_bytes_per_bit;
 	uint32_t reserved_u32[4];
 
-	char reserved[8 * 512 - (8*(UI_SIZE+3)+4*11)];
+	/* Unnecessary for libblkid **
+	 * char reserved[8 * 512 - (8*(UI_SIZE+3)+4*11)];
+	 */
 };
 
 /*
@@ -109,7 +118,9 @@ struct meta_data_on_disk_9 {
 	struct peer_dev_md_on_disk_9 peers[DRBD_PEERS_MAX];
 	uint64_t history_uuids[HISTORY_UUIDS];
 
-	char padding[0] __attribute__((aligned(4096)));
+	/* Unnecessary for libblkid **
+	 * char padding[0] __attribute__((aligned(4096)));
+	 */
 } __attribute__((packed));
 
 
@@ -118,7 +129,7 @@ static int probe_drbd_84(blkid_probe pr)
 	struct md_on_disk_08 *md;
 	off_t off;
 
-	off = pr->size - sizeof(*md);
+	off = pr->size - DRBD_MD_OFFSET;
 
 	/* Small devices cannot be drbd (?) */
 	if (pr->size < 0x10000)
@@ -159,7 +170,7 @@ static int probe_drbd_90(blkid_probe pr)
 	struct meta_data_on_disk_9 *md;
 	off_t off;
 
-	off = pr->size - sizeof(*md);
+	off = pr->size - DRBD_MD_OFFSET;
 
 	/*
 	 * Smaller ones are certainly not DRBD9 devices.
diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index 5ea2a454a..90a102f89 100644
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -78,7 +78,7 @@ struct file_attribute {
 #define	MFT_RECORD_ATTR_VOLUME_NAME	0x60
 #define	MFT_RECORD_ATTR_END		0xffffffff
 
-static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
+static int __probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag, int save_info)
 {
 	struct ntfs_super_block *ns;
 	struct master_file_table_record *mft;
@@ -174,6 +174,10 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
 	if (memcmp(buf_mft, "FILE", 4))
 		return 1;
 
+	/* return if caller does not care about UUID and LABEL */
+	if (!save_info)
+		return 0;
+
 	mft = (struct master_file_table_record *) buf_mft;
 	attr_off = le16_to_cpu(mft->attrs_offset);
 
@@ -211,6 +215,24 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
 	return 0;
 }
 
+static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag)
+{
+	return __probe_ntfs(pr, mag, 1);
+}
+
+int blkid_probe_is_ntfs(blkid_probe pr)
+{
+	const struct blkid_idmag *mag = NULL;
+	int rc;
+
+	rc = blkid_probe_get_idmag(pr, &ntfs_idinfo, NULL, &mag);
+	if (rc < 0)
+		return rc;	/* error */
+	if (rc != BLKID_PROBE_OK || !mag)
+		return 0;
+
+	return __probe_ntfs(pr, mag, 0) == 0 ? 1 : 0;
+}
 
 const struct blkid_idinfo ntfs_idinfo =
 {
diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h
index 3313d0245..59682c86d 100644
--- a/libblkid/src/superblocks/superblocks.h
+++ b/libblkid/src/superblocks/superblocks.h
@@ -109,5 +109,6 @@ extern int blkid_probe_set_utf8_id_label(blkid_probe pr, const char *name,
 			     const unsigned char *data, size_t len, int enc);
 
 extern int blkid_probe_is_bitlocker(blkid_probe pr);
+extern int blkid_probe_is_ntfs(blkid_probe pr);
 
 #endif /* _BLKID_SUPERBLOCKS_H */
diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c
index 4d4b46d55..0af14fb65 100644
--- a/libblkid/src/superblocks/zfs.c
+++ b/libblkid/src/superblocks/zfs.c
@@ -58,7 +58,7 @@ struct nvuint64 {
 	uint32_t	nvu_type;
 	uint32_t	nvu_elem;
 	uint64_t	nvu_value;
-};
+} __attribute__((packed));
 
 struct nvlist {
 	uint32_t	nvl_unknown[3];