summaryrefslogtreecommitdiffstats
path: root/disk-utils/fsck.minix.c
diff options
context:
space:
mode:
authorKarel Zak2009-02-05 16:44:17 +0100
committerKarel Zak2009-02-05 16:47:30 +0100
commit95356e8b744439336925eeb36f01399f1ee8a5e9 (patch)
tree0a7b88fc4eac18d7d93badc8db1ee3f4565904b9 /disk-utils/fsck.minix.c
parentfsck.minix: add regression test (diff)
downloadkernel-qcow2-util-linux-95356e8b744439336925eeb36f01399f1ee8a5e9.tar.gz
kernel-qcow2-util-linux-95356e8b744439336925eeb36f01399f1ee8a5e9.tar.xz
kernel-qcow2-util-linux-95356e8b744439336925eeb36f01399f1ee8a5e9.zip
mkfs.minix: remove local implementation of {set,clr}bit
We needn't to duplicate stuff from <sys/param.h>. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/fsck.minix.c')
-rw-r--r--disk-utils/fsck.minix.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index f6930d2a3..af54c9873 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -100,6 +100,7 @@
#include <termios.h>
#include <mntent.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <signal.h>
#include "minix.h"
@@ -169,10 +170,8 @@ static unsigned char * zone_count = NULL;
static void recursive_check(unsigned int ino);
static void recursive_check2(unsigned int ino);
-#include "minix_bitops.h"
-
-#define inode_in_use(x) (bit(inode_map,(x)))
-#define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
+#define inode_in_use(x) (isset(inode_map,(x)))
+#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
#define mark_inode(x) (setbit(inode_map,(x)),changed=1)
#define unmark_inode(x) (clrbit(inode_map,(x)),changed=1)
@@ -180,7 +179,6 @@ static void recursive_check2(unsigned int ino);
#define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1)
#define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1)
-
static void
reset(void) {
if (termios_set)