diff options
| -rw-r--r-- | e2fsprogs/Config.in | 12 | ||||
| -rw-r--r-- | e2fsprogs/Kbuild | 3 | ||||
| -rw-r--r-- | e2fsprogs/tune2fs.c (renamed from util-linux/tune2fs.c) | 7 | ||||
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | util-linux/Kbuild | 1 | ||||
| -rw-r--r-- | util-linux/mkfs_ext2.c | 7 | ||||
| -rw-r--r-- | util-linux/mkfs_reiser.c | 7 | ||||
| -rw-r--r-- | util-linux/mkfs_vfat.c | 7 |
8 files changed, 21 insertions, 25 deletions
diff --git a/e2fsprogs/Config.in b/e2fsprogs/Config.in index 9a0088ab5..964d08e4c 100644 --- a/e2fsprogs/Config.in +++ b/e2fsprogs/Config.in @@ -41,12 +41,12 @@ config LSATTR ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. -### config TUNE2FS -### bool "tune2fs" -### default n -### help -### tune2fs allows the system administrator to adjust various tunable -### filesystem parameters on Linux ext2/ext3 filesystems. +config TUNE2FS + bool "tune2fs" + default n + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. ### config E2LABEL ### bool "e2label" diff --git a/e2fsprogs/Kbuild b/e2fsprogs/Kbuild index 9f58ce092..0fdc9d215 100644 --- a/e2fsprogs/Kbuild +++ b/e2fsprogs/Kbuild @@ -9,4 +9,5 @@ lib-y:= lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o -lib-$(CONFIG_FSCK) += fsck.o +lib-$(CONFIG_FSCK) += fsck.o +lib-$(CONFIG_TUNE2FS) += tune2fs.o diff --git a/util-linux/tune2fs.c b/e2fsprogs/tune2fs.c index 3b8f3d8ef..00ede4f1e 100644 --- a/util-linux/tune2fs.c +++ b/e2fsprogs/tune2fs.c @@ -9,16 +9,15 @@ #include "libbb.h" #include <linux/fs.h> #include <linux/ext2_fs.h> -#include "volume_id/volume_id_internal.h" // storage helpers char BUG_wrong_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ @@ -26,7 +25,7 @@ do { \ } while (0) #define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) + (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) enum { OPT_L = 1 << 0, // label diff --git a/include/applets.h b/include/applets.h index 6d7af5253..36b24856a 100644 --- a/include/applets.h +++ b/include/applets.h @@ -405,7 +405,7 @@ IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true)) IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) +IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd)) diff --git a/util-linux/Kbuild b/util-linux/Kbuild index 99e3efea3..4fa392398 100644 --- a/util-linux/Kbuild +++ b/util-linux/Kbuild @@ -42,5 +42,4 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o lib-$(CONFIG_SETARCH) += setarch.o lib-$(CONFIG_SWAPONOFF) += swaponoff.o lib-$(CONFIG_SWITCH_ROOT) += switch_root.o -lib-$(CONFIG_MKFS_EXT2) += tune2fs.o lib-$(CONFIG_UMOUNT) += umount.o diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index cf40c20eb..fd54734fc 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -10,7 +10,6 @@ #include "libbb.h" #include <linux/fs.h> #include <linux/ext2_fs.h> -#include "volume_id/volume_id_internal.h" #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 @@ -29,9 +28,9 @@ char BUG_wrong_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ @@ -39,7 +38,7 @@ do { \ } while (0) #define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) + (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) // All fields are little-endian struct ext2_dir { diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index eb2c94d02..f9a0ca82a 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c @@ -8,15 +8,14 @@ */ #include "libbb.h" #include <linux/fs.h> -#include "volume_id/volume_id_internal.h" char BUG_wrong_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ @@ -24,7 +23,7 @@ do { \ } while (0) #define FETCH_LE32(field) \ - (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) + (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) struct journal_params { uint32_t jp_journal_1st_block; /* where does journal start from on its device */ diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 1363612f2..ff3e4165a 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c @@ -16,7 +16,6 @@ # define BLKSSZGET _IO(0x12, 104) #endif //#include <linux/msdos_fs.h> -#include "volume_id/volume_id_internal.h" #define SECTOR_SIZE 512 @@ -168,15 +167,15 @@ static const char boot_code[] ALIGN1 = #define MARK_CLUSTER(cluster, value) \ - ((uint32_t *)fat)[cluster] = cpu_to_le32(value) + ((uint32_t *)fat)[cluster] = SWAP_LE32(value) void BUG_unsupported_field_size(void); #define STORE_LE(field, value) \ do { \ if (sizeof(field) == 4) \ - field = cpu_to_le32(value); \ + field = SWAP_LE32(value); \ else if (sizeof(field) == 2) \ - field = cpu_to_le16(value); \ + field = SWAP_LE16(value); \ else if (sizeof(field) == 1) \ field = (value); \ else \ |