Convert a chunk of usage.h to USE_ and SKIP_ (more to do there), and fix a

[oweals/busybox.git] / e2fsprogs / tune2fs.c

diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index f228c56aa692d5fb47b6cd1083c8388f932f692d..65ff445e7fd0e2bf6b6ba1bee16aa57b27153f71 100644 (file)
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -39,7 +39,7 @@
 #include "ext2fs/ext2fs.h"
 #include "uuid/uuid.h"
 #include "e2p/e2p.h"
-#include "ext2fs/jfs_user.h"
+#include "ext2fs/kernel-jbd.h"
 #include "util.h"
 #include "blkid/blkid.h"
 
@@ -579,7 +579,7 @@ static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv)
 #define do_findfs(x, y)
 #endif
 
-static void clean_up(void)
+static void tune2fs_clean_up(void)
 {
        if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name);
        if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
@@ -593,7 +593,7 @@ int tune2fs_main(int argc, char **argv)
        io_manager io_ptr;
 
        if (ENABLE_FEATURE_CLEAN_UP)
-               atexit(clean_up);
+               atexit(tune2fs_clean_up);
 
        if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */
                do_findfs(argc, argv);  /* no return */