diff options
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fsck_minix.c | 12 | ||||
-rw-r--r-- | util-linux/mdev.c | 12 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 3ebc07661..dba52417e 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) | |||
244 | return (size + n-1) / n; | 244 | return (size + n-1) / n; |
245 | } | 245 | } |
246 | 246 | ||
247 | #if ENABLE_FEATURE_MINIX2 | 247 | #if !ENABLE_FEATURE_MINIX2 |
248 | #define INODE_BLOCKS div_roundup(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \ | 248 | #define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK) |
249 | : MINIX1_INODES_PER_BLOCK)) | ||
250 | #else | 249 | #else |
251 | #define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK) | 250 | #define INODE_BLOCKS div_roundup(INODES, \ |
251 | (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK)) | ||
252 | #endif | 252 | #endif |
253 | 253 | ||
254 | #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE) | 254 | #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE) |
255 | #define NORM_FIRSTZONE (2 + IMAPS + ZMAPS + INODE_BLOCKS) | 255 | #define NORM_FIRSTZONE (2 + IMAPS + ZMAPS + INODE_BLOCKS) |
256 | 256 | ||
257 | /* Before you ask "where they come from?": */ | 257 | /* Before you ask "where they come from?": */ |
258 | /* setbit/clrbit are supplied by sys/param.h */ | 258 | /* setbit/clrbit are supplied by sys/param.h */ |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 057b9e4ff..e1edd2073 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -300,9 +300,9 @@ static void make_device(char *path, int delete) | |||
300 | 300 | ||
301 | /* File callback for /sys/ traversal */ | 301 | /* File callback for /sys/ traversal */ |
302 | static int fileAction(const char *fileName, | 302 | static int fileAction(const char *fileName, |
303 | struct stat *statbuf ATTRIBUTE_UNUSED, | 303 | struct stat *statbuf ATTRIBUTE_UNUSED, |
304 | void *userData, | 304 | void *userData, |
305 | int depth ATTRIBUTE_UNUSED) | 305 | int depth ATTRIBUTE_UNUSED) |
306 | { | 306 | { |
307 | size_t len = strlen(fileName) - 4; /* can't underflow */ | 307 | size_t len = strlen(fileName) - 4; /* can't underflow */ |
308 | char *scratch = userData; | 308 | char *scratch = userData; |
@@ -320,9 +320,9 @@ static int fileAction(const char *fileName, | |||
320 | 320 | ||
321 | /* Directory callback for /sys/ traversal */ | 321 | /* Directory callback for /sys/ traversal */ |
322 | static int dirAction(const char *fileName ATTRIBUTE_UNUSED, | 322 | static int dirAction(const char *fileName ATTRIBUTE_UNUSED, |
323 | struct stat *statbuf ATTRIBUTE_UNUSED, | 323 | struct stat *statbuf ATTRIBUTE_UNUSED, |
324 | void *userData ATTRIBUTE_UNUSED, | 324 | void *userData ATTRIBUTE_UNUSED, |
325 | int depth) | 325 | int depth) |
326 | { | 326 | { |
327 | return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE); | 327 | return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE); |
328 | } | 328 | } |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 60031a5c3..49b1d4cca 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) | |||
149 | #else | 149 | #else |
150 | # define SB_ZONES (version2 ? SB.s_zones : SB.s_nzones) | 150 | # define SB_ZONES (version2 ? SB.s_zones : SB.s_nzones) |
151 | # define INODE_BLOCKS div_roundup(SB_INODES, \ | 151 | # define INODE_BLOCKS div_roundup(SB_INODES, \ |
152 | version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK) | 152 | (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK)) |
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE) | 155 | #define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE) |