[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: [PATCH 1/2] blkid: remove CONFIG_FEATURE_BLKID_TYPE=n
From: "Alex Xu (Hello71)" <alex_y_xu () yahoo ! ca>
Date: 2021-11-25 23:22:49
Message-ID: 20211125232250.87522-1-alex_y_xu () yahoo ! ca
[Download RAW message or body]
It complicates implementation of volume_id for mount and saves only ~20
bytes per filesystem type. In any case where 553 bytes is critical,
filesystems will be individually selected. Suppose 3 filesystem types
are enabled, then CONFIG_FEATURE_BLKID_TYPE=n saves only ~60 bytes,
which is negligible.
function old new delta
.rodata 3269 3455 +186
volume_id_probe_ext 80 126 +46
volume_id_probe_sysv 172 207 +35
display_uuid_cache 117 145 +28
volume_id_probe_hfs_hfsplus 471 497 +26
add_to_uuid_cache 300 326 +26
volume_id_probe_linux_swap 271 294 +23
volume_id_probe_nilfs 86 102 +16
volume_id_probe_udf 613 626 +13
volume_id_probe_ntfs 274 287 +13
volume_id_probe_exfat 262 274 +12
volume_id_probe_xfs 110 121 +11
volume_id_probe_ubifs 68 79 +11
volume_id_probe_romfs 105 116 +11
volume_id_probe_ocfs2 119 130 +11
volume_id_probe_luks 96 107 +11
volume_id_probe_jfs 119 130 +11
volume_id_probe_f2fs 98 109 +11
volume_id_probe_erofs 80 91 +11
volume_id_probe_btrfs 159 170 +11
volume_id_probe_bcache 114 125 +11
volume_id_probe_minix 72 82 +10
volume_id_probe_vfat 903 912 +9
volume_id_probe_linux_raid 143 152 +9
volume_id_probe_iso9660 408 415 +7
volume_id_probe_cramfs 68 69 +1
volume_id_probe_reiserfs 296 279 -17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 26/1 up/down: 570/-17) Total: 553 bytes
---
configs/android2_defconfig | 1 -
configs/android_502_defconfig | 1 -
configs/android_defconfig | 1 -
configs/android_ndk_defconfig | 1 -
configs/cygwin_defconfig | 1 -
util-linux/blkid.c | 7 ------
util-linux/volume_id/bcache.c | 2 +-
util-linux/volume_id/btrfs.c | 2 +-
util-linux/volume_id/cramfs.c | 2 +-
util-linux/volume_id/erofs.c | 2 +-
util-linux/volume_id/exfat.c | 2 +-
util-linux/volume_id/ext.c | 3 +--
util-linux/volume_id/f2fs.c | 2 +-
util-linux/volume_id/fat.c | 2 +-
util-linux/volume_id/get_devname.c | 29 ++++-------------------
util-linux/volume_id/hfs.c | 4 ++--
util-linux/volume_id/iso9660.c | 2 +-
util-linux/volume_id/jfs.c | 2 +-
util-linux/volume_id/lfs.c | 4 ++--
util-linux/volume_id/linux_raid.c | 2 +-
util-linux/volume_id/linux_swap.c | 2 +-
util-linux/volume_id/luks.c | 2 +-
util-linux/volume_id/minix.c | 2 +-
util-linux/volume_id/nilfs.c | 2 +-
util-linux/volume_id/ntfs.c | 2 +-
util-linux/volume_id/ocfs2.c | 2 +-
util-linux/volume_id/reiserfs.c | 2 +-
util-linux/volume_id/romfs.c | 2 +-
util-linux/volume_id/squashfs.c | 4 ++--
util-linux/volume_id/sysv.c | 4 ++--
util-linux/volume_id/ubifs.c | 2 +-
util-linux/volume_id/udf.c | 2 +-
util-linux/volume_id/volume_id_internal.h | 2 --
util-linux/volume_id/xfs.c | 2 +-
34 files changed, 35 insertions(+), 69 deletions(-)
diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index d4b8f1616..10eb2b290 100644
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -502,7 +502,6 @@ CONFIG_REV=y
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
CONFIG_BLKID=y
-# CONFIG_FEATURE_BLKID_TYPE is not set
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index 104e70f23..908feddb7 100644
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -631,7 +631,6 @@ CONFIG_UEVENT=y
CONFIG_ACPID=y
CONFIG_FEATURE_ACPID_COMPAT=y
CONFIG_BLKID=y
-# CONFIG_FEATURE_BLKID_TYPE is not set
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
diff --git a/configs/android_defconfig b/configs/android_defconfig
index 92a66048a..c64349ebe 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -532,7 +532,6 @@ CONFIG_REV=y
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
CONFIG_BLKID=y
-CONFIG_FEATURE_BLKID_TYPE=y
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index 425593454..8cb74404b 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -555,7 +555,6 @@ CONFIG_UEVENT=y
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
CONFIG_BLKID=y
-CONFIG_FEATURE_BLKID_TYPE=y
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig
index c09bc9281..81719c1cc 100644
--- a/configs/cygwin_defconfig
+++ b/configs/cygwin_defconfig
@@ -505,7 +505,6 @@ CONFIG_REV=y
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
# CONFIG_DMESG is not set
# CONFIG_FEATURE_DMESG_PRETTY is not set
# CONFIG_FBSET is not set
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 4a820771f..e8907c101 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -12,13 +12,6 @@
//config: select VOLUMEID
//config: help
//config: Lists labels and UUIDs of all filesystems.
-//config:
-//config:config FEATURE_BLKID_TYPE
-//config: bool "Print filesystem type"
-//config: default y
-//config: depends on BLKID
-//config: help
-//config: Show TYPE="filesystem type"
//applet:IF_BLKID(APPLET_NOEXEC(blkid, blkid, BB_DIR_SBIN, BB_SUID_DROP, blkid))
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index 085c158db..2c5589380 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -99,7 +99,7 @@ int FAST_FUNC volume_id_probe_bcache(struct volume_id *id \
/*,uint64_t off*/)
volume_id_set_label_string(id, sb->label, SB_LABEL_SIZE);
volume_id_set_uuid(id, sb->uuid, UUID_DCE);
- IF_FEATURE_BLKID_TYPE(id->type = "bcache";)
+ id->type = "bcache";
return 0;
}
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index a3ddf9782..ee1dc4ccb 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -108,7 +108,7 @@ int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id \
/*,uint64_t off*/) // N.B.: btrfs natively supports 256 (>VOLUME_ID_LABEL_SIZE) size \
labels volume_id_set_label_string(id, sb->label, VOLUME_ID_LABEL_SIZE);
volume_id_set_uuid(id, sb->fsid, UUID_DCE);
- IF_FEATURE_BLKID_TYPE(id->type = "btrfs";)
+ id->type = "btrfs";
return 0;
}
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index 3468a5005..d6f7572e8 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -57,7 +57,7 @@ int FAST_FUNC volume_id_probe_cramfs(struct volume_id *id \
/*,uint64_t off*/) volume_id_set_label_string(id, cs->name, 16);
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "cramfs";)
+ id->type = "cramfs";
return 0;
}
diff --git a/util-linux/volume_id/erofs.c b/util-linux/volume_id/erofs.c
index a163a353d..3688dc4d5 100644
--- a/util-linux/volume_id/erofs.c
+++ b/util-linux/volume_id/erofs.c
@@ -56,7 +56,7 @@ int FAST_FUNC volume_id_probe_erofs(struct volume_id *id \
/*,uint64_t off*/) if (sb->magic != cpu_to_le32(EROFS_SUPER_MAGIC_V1))
return -1;
- IF_FEATURE_BLKID_TYPE(id->type = "erofs");
+ id->type = "erofs";
volume_id_set_label_string(id, sb->volume_name,
MIN(sizeof(sb->volume_name), VOLUME_ID_LABEL_SIZE));
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index 952b027d9..d90df60d9 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -135,6 +135,6 @@ int FAST_FUNC volume_id_probe_exfat(struct volume_id *id \
/*,uint64_t off*/) break;
}
- IF_FEATURE_BLKID_TYPE(id->type = "exfat";)
+ id->type = "exfat";
return 0;
}
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index f17faddb6..be441b35f 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -51,7 +51,6 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t \
off*/) volume_id_set_uuid(id, es->s_uuid, UUID_DCE);
dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
-#if ENABLE_FEATURE_BLKID_TYPE
if ((es->s_feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | \
EXT4_FEATURE_RO_COMPAT_DIR_NLINK)) || (es->s_feature_incompat & \
cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT)) ) {
@@ -61,6 +60,6 @@ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t \
off*/) id->type = "ext3";
else
id->type = "ext2";
-#endif
+
return 0;
}
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index e6100aec2..dbce91815 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -77,7 +77,7 @@ int FAST_FUNC volume_id_probe_f2fs(struct volume_id *id /*,uint64_t \
off*/) if (sb->magic != cpu_to_le32(F2FS_MAGIC))
return -1;
- IF_FEATURE_BLKID_TYPE(id->type = "f2fs");
+ id->type = "f2fs";
// For version 1.0 we don't know sb structure and can't set label/uuid
if (sb->major_ver == cpu_to_le16(1) && sb->minor_ver == cpu_to_le16(0))
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index fe3750880..806d94f55 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -338,7 +338,7 @@ int FAST_FUNC volume_id_probe_vfat(struct volume_id *id \
/*,uint64_t fat_partitio
ret:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "vfat";)
+ id->type = "vfat";
return 0;
}
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 00cfb2826..9a5f6abce 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -25,16 +25,9 @@ static struct uuidCache_s {
char *device;
char *label;
char *uc_uuid; /* prefix makes it easier to grep for */
- IF_FEATURE_BLKID_TYPE(const char *type;)
+ const char *type;
} *uuidCache;
-#if !ENABLE_FEATURE_BLKID_TYPE
-#define get_label_uuid(fd, label, uuid, type) \
- get_label_uuid(fd, label, uuid)
-#define uuidcache_addentry(device, label, uuid, type) \
- uuidcache_addentry(device, label, uuid)
-#endif
-
/* Returns !0 on error.
* Otherwise, returns malloc'ed strings for label and uuid
* (and they can't be NULL, although they can be "").
@@ -55,19 +48,11 @@ get_label_uuid(int fd, char **label, char **uuid, const char \
**type) if (volume_id_probe_all(vid, /*0,*/ size) != 0)
goto ret;
- if (vid->label[0] != '\0' || vid->uuid[0] != '\0'
-#if ENABLE_FEATURE_BLKID_TYPE
- || vid->type != NULL
-#endif
- ) {
+ if (vid->label[0] != '\0' || vid->uuid[0] != '\0' || vid->type != NULL) {
*label = xstrndup(vid->label, sizeof(vid->label));
*uuid = xstrndup(vid->uuid, sizeof(vid->uuid));
-#if ENABLE_FEATURE_BLKID_TYPE
*type = vid->type;
dbg("found label '%s', uuid '%s', type '%s'", *label, *uuid, *type);
-#else
- dbg("found label '%s', uuid '%s'", *label, *uuid);
-#endif
rv = 0;
}
ret:
@@ -95,7 +80,7 @@ uuidcache_addentry(char *device, /*int major, int minor,*/ char \
*label, char *uu last->device = device;
last->label = label;
last->uc_uuid = uuid;
- IF_FEATURE_BLKID_TYPE(last->type = type;)
+ last->type = type;
}
/* If get_label_uuid() on device_name returns success,
@@ -240,10 +225,8 @@ void display_uuid_cache(int scan_devices)
printf(" LABEL=\"%s\"", uc->label);
if (uc->uc_uuid[0])
printf(" UUID=\"%s\"", uc->uc_uuid);
-#if ENABLE_FEATURE_BLKID_TYPE
- if (uc->type)
- printf(" TYPE=\"%s\"", uc->type);
-#endif
+ if (uc->type)
+ printf(" TYPE=\"%s\"", uc->type);
bb_putchar('\n');
uc = uc->next;
}
@@ -253,9 +236,7 @@ int add_to_uuid_cache(const char *device)
{
char *uuid = uuid; /* for compiler */
char *label = label;
-#if ENABLE_FEATURE_BLKID_TYPE
const char *type = type;
-#endif
int fd;
fd = open(device, O_RDONLY);
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 05d16db34..16ef8c93e 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -222,7 +222,7 @@ int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id \
/*,uint64_t off*/
hfs_set_uuid(id, hfs->finder_info.id);
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "hfs";)
+ id->type = "hfs";
return 0;
@@ -313,7 +313,7 @@ int FAST_FUNC volume_id_probe_hfs_hfsplus(struct volume_id *id \
/*,uint64_t off*/
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "hfsplus";)
+ id->type = "hfsplus";
return 0;
}
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index c771b01f5..f8e00b40d 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -120,7 +120,7 @@ int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id \
/*,uint64_t off*/)
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "iso9660";)
+ id->type = "iso9660";
return 0;
}
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index 5e523e236..902788dc5 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -60,7 +60,7 @@ int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t \
off*/) volume_id_set_uuid(id, js->uuid, UUID_DCE);
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "jfs";)
+ id->type = "jfs";
return 0;
}
diff --git a/util-linux/volume_id/lfs.c b/util-linux/volume_id/lfs.c
index 1a2a2987f..396e78d0e 100644
--- a/util-linux/volume_id/lfs.c
+++ b/util-linux/volume_id/lfs.c
@@ -8,7 +8,7 @@
//config:config FEATURE_VOLUMEID_LFS
//config: bool "LittleFS filesystem"
//config: default y
-//config: depends on VOLUMEID && FEATURE_BLKID_TYPE
+//config: depends on VOLUMEID
//config: help
//config: LittleFS is a small fail-safe filesystem designed for embedded
//config: systems. It has strong copy-on-write guarantees and storage on disk
@@ -56,7 +56,7 @@ int FAST_FUNC volume_id_probe_lfs(struct volume_id *id /*,uint64_t \
off*/) if (memcmp(sb->magic, LFS_MAGIC_NAME, LFS_MAGIC_LEN) != 0)
return -1;
- IF_FEATURE_BLKID_TYPE(id->type = LFS_MAGIC_NAME);
+ id->type = LFS_MAGIC_NAME;
return 0;
}
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index db6209a4d..4d3df402e 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -81,7 +81,7 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id \
/*,uint64_t off*/,
dbg("found raid signature");
// volume_id_set_usage(id, VOLUME_ID_RAID);
- IF_FEATURE_BLKID_TYPE(id->type = "linux_raid_member";)
+ id->type = "linux_raid_member";
return 0;
}
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 78b339cf0..2496a096c 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -78,7 +78,7 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id \
/*,uint64_t off*/)
found:
// volume_id_set_usage(id, VOLUME_ID_OTHER);
- IF_FEATURE_BLKID_TYPE(id->type = "swap";)
+ id->type = "swap";
return 0;
}
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 8e634d4ee..e40185d79 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -100,7 +100,7 @@ int FAST_FUNC volume_id_probe_luks(struct volume_id *id \
/*,uint64_t off*/)
// volume_id_set_usage(id, VOLUME_ID_CRYPTO);
volume_id_set_uuid(id, header->uuid, UUID_DCE_STRING);
- IF_FEATURE_BLKID_TYPE(id->type = "crypto_LUKS";)
+ id->type = "crypto_LUKS";
return 0;
}
diff --git a/util-linux/volume_id/minix.c b/util-linux/volume_id/minix.c
index c934f9ead..41c0f4df2 100644
--- a/util-linux/volume_id/minix.c
+++ b/util-linux/volume_id/minix.c
@@ -86,6 +86,6 @@ int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*, \
uint64_t off*/)
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "minix";)
+ id->type = "minix";
return 0;
}
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index 7a8b798df..a790c5102 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -107,7 +107,7 @@ int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id \
/*,uint64_t off*/) volume_id_set_uuid(id, sb->s_uuid, UUID_DCE);
if (sb->s_rev_level == 2)
- IF_FEATURE_BLKID_TYPE(id->type = "nilfs2");
+ id->type = "nilfs2";
return 0;
}
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 22dd77fc7..86c4746c8 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -194,7 +194,7 @@ int FAST_FUNC volume_id_probe_ntfs(struct volume_id *id \
/*,uint64_t off*/)
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "ntfs";)
+ id->type = "ntfs";
return 0;
}
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 235968b88..296485b6c 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -107,6 +107,6 @@ int FAST_FUNC volume_id_probe_ocfs2(struct volume_id *id \
/*,uint64_t off*/) volume_id_set_label_string(id, os->s_label, \
OCFS2_MAX_VOL_LABEL_LEN < VOLUME_ID_LABEL_SIZE ? OCFS2_MAX_VOL_LABEL_LEN : \
VOLUME_ID_LABEL_SIZE); volume_id_set_uuid(id, os->s_uuid, UUID_DCE);
- IF_FEATURE_BLKID_TYPE(id->type = "ocfs2";)
+ id->type = "ocfs2";
return 0;
}
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index d9fd8944d..24af88f3e 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -113,7 +113,7 @@ int FAST_FUNC volume_id_probe_reiserfs(struct volume_id *id \
/*,uint64_t off*/)
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "reiserfs";)
+ id->type = "reiserfs";
return 0;
}
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index bd74fda8d..915af951f 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -53,7 +53,7 @@ int FAST_FUNC volume_id_probe_romfs(struct volume_id *id \
/*,uint64_t off*/) }
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "romfs";)
+ id->type = "romfs";
return 0;
}
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index 4b65afd8b..a1fddcb69 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -8,7 +8,7 @@
//config:config FEATURE_VOLUMEID_SQUASHFS
//config: bool "SquashFS filesystem"
//config: default y
-//config: depends on VOLUMEID && FEATURE_BLKID_TYPE
+//config: depends on VOLUMEID
//config: help
//config: Squashfs is a compressed read-only filesystem for Linux. Squashfs is
//config: intended for general read-only filesystem use and in constrained block
@@ -50,7 +50,7 @@ int FAST_FUNC volume_id_probe_squashfs(struct volume_id *id \
/*,uint64_t off*/) || sb->magic == SIG3
|| sb->magic == SIG4
) {
- IF_FEATURE_BLKID_TYPE(id->type = "squashfs";)
+ id->type = "squashfs";
return 0;
}
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index be41f8048..2a069e228 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -105,7 +105,7 @@ int FAST_FUNC volume_id_probe_sysv(struct volume_id *id \
/*,uint64_t off*/) if (vs->s_magic == cpu_to_le32(SYSV_MAGIC) || vs->s_magic == \
cpu_to_be32(SYSV_MAGIC)) { // volume_id_set_label_raw(id, vs->s_fname, 6);
volume_id_set_label_string(id, vs->s_fname, 6);
- IF_FEATURE_BLKID_TYPE(id->type = "sysv");
+ id->type = "sysv";
goto found;
}
}
@@ -118,7 +118,7 @@ int FAST_FUNC volume_id_probe_sysv(struct volume_id *id \
/*,uint64_t off*/) if (xs->s_magic == cpu_to_le32(XENIX_MAGIC) || xs->s_magic == \
cpu_to_be32(XENIX_MAGIC)) { // volume_id_set_label_raw(id, xs->s_fname, 6);
volume_id_set_label_string(id, xs->s_fname, 6);
- IF_FEATURE_BLKID_TYPE(id->type = "xenix";)
+ id->type = "xenix";
goto found;
}
}
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index aee53f9dd..780d06bb9 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -115,7 +115,7 @@ int FAST_FUNC volume_id_probe_ubifs(struct volume_id *id \
/*,uint64_t off*/) if (le32_to_cpu(sb->ch.magic) != UBIFS_NODE_MAGIC)
return -1;
- IF_FEATURE_BLKID_TYPE(id->type = "ubifs";)
+ id->type = "ubifs";
volume_id_set_uuid(id, sb->uuid, UUID_DCE);
return 0;
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index 0df4a86df..93f960351 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -173,6 +173,6 @@ anchor:
found:
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "udf";)
+ id->type = "udf";
return 0;
}
diff --git a/util-linux/volume_id/volume_id_internal.h \
b/util-linux/volume_id/volume_id_internal.h index b1e44481f..cff9b882e 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -66,9 +66,7 @@ struct volume_id {
uint8_t *sbbuf;
uint8_t *seekbuf;
uint64_t seekbuf_off;
-#if ENABLE_FEATURE_BLKID_TYPE
const char *type;
-#endif
#ifdef UNUSED_PARTITION_CODE
struct volume_id_partition *partitions;
size_t partition_count;
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index f98b66a53..092cae47b 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -60,7 +60,7 @@ int FAST_FUNC volume_id_probe_xfs(struct volume_id *id /*,uint64_t \
off*/) volume_id_set_uuid(id, xs->uuid, UUID_DCE);
// volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
- IF_FEATURE_BLKID_TYPE(id->type = "xfs";)
+ id->type = "xfs";
return 0;
}
--
2.34.1
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic