summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fsck_minix.c12
-rw-r--r--util-linux/mdev.c12
-rw-r--r--util-linux/mkfs_minix.c2
3 files changed, 13 insertions, 13 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 3ebc076..dba5241 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -244,15 +244,15 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
return (size + n-1) / n;
}
-#if ENABLE_FEATURE_MINIX2
-#define INODE_BLOCKS div_roundup(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
- : MINIX1_INODES_PER_BLOCK))
+#if !ENABLE_FEATURE_MINIX2
+#define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
#else
-#define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
+#define INODE_BLOCKS div_roundup(INODES, \
+ (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
#endif
-#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
-#define NORM_FIRSTZONE (2 + IMAPS + ZMAPS + INODE_BLOCKS)
+#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
+#define NORM_FIRSTZONE (2 + IMAPS + ZMAPS + INODE_BLOCKS)
/* Before you ask "where they come from?": */
/* setbit/clrbit are supplied by sys/param.h */
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 057b9e4..e1edd20 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -300,9 +300,9 @@ static void make_device(char *path, int delete)
/* File callback for /sys/ traversal */
static int fileAction(const char *fileName,
- struct stat *statbuf ATTRIBUTE_UNUSED,
- void *userData,
- int depth ATTRIBUTE_UNUSED)
+ struct stat *statbuf ATTRIBUTE_UNUSED,
+ void *userData,
+ int depth ATTRIBUTE_UNUSED)
{
size_t len = strlen(fileName) - 4; /* can't underflow */
char *scratch = userData;
@@ -320,9 +320,9 @@ static int fileAction(const char *fileName,
/* Directory callback for /sys/ traversal */
static int dirAction(const char *fileName ATTRIBUTE_UNUSED,
- struct stat *statbuf ATTRIBUTE_UNUSED,
- void *userData ATTRIBUTE_UNUSED,
- int depth)
+ struct stat *statbuf ATTRIBUTE_UNUSED,
+ void *userData ATTRIBUTE_UNUSED,
+ int depth)
{
return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
}
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 60031a5..49b1d4c 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -149,7 +149,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
#else
# define SB_ZONES (version2 ? SB.s_zones : SB.s_nzones)
# define INODE_BLOCKS div_roundup(SB_INODES, \
- version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK)
+ (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
#endif
#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)