diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-05-21 22:34:29 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-05-21 23:03:38 -0700 |
| commit | 4f216e6b06b13aaa94362ba0f6f36cbae06331e1 (patch) | |
| tree | 7272460981b412ceaa34618901d4806b58a943ae | |
| parent | 48c5dbb435f1603ca7638f5216a168fbef7879a4 (diff) | |
| download | f2fs-tools-4f216e6b06b13aaa94362ba0f6f36cbae06331e1.tar.gz | |
f2fs-tools: move android_config before defining them
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/f2fs.h | 4 | ||||
| -rw-r--r-- | fsck/xattr.h | 2 | ||||
| -rw-r--r-- | mkfs/f2fs_format.c | 6 | ||||
| -rw-r--r-- | tools/f2fscrypt.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/fsck/f2fs.h b/fsck/f2fs.h index 875f953..030d750 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -20,6 +20,8 @@ #include <fcntl.h> #include <string.h> #include <errno.h> +#include <f2fs_fs.h> + #ifdef HAVE_MNTENT_H #include <mntent.h> #endif @@ -35,8 +37,6 @@ #endif #include <assert.h> -#include "f2fs_fs.h" - #define EXIT_ERR_CODE (-1) #define ver_after(a, b) (typecheck(unsigned long long, a) && \ typecheck(unsigned long long, b) && \ diff --git a/fsck/xattr.h b/fsck/xattr.h index 4e4b50d..74aa541 100644 --- a/fsck/xattr.h +++ b/fsck/xattr.h @@ -35,7 +35,9 @@ struct f2fs_xattr_entry { }; #define FS_ENCRYPTION_CONTEXT_FORMAT_V1 1 +#ifndef FS_KEY_DESCRIPTOR_SIZE #define FS_KEY_DESCRIPTOR_SIZE 8 +#endif #define FS_KEY_DERIVATION_NONCE_SIZE 16 struct fscrypt_context { diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 2759b5a..3b96d31 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -8,11 +8,15 @@ */ #define _LARGEFILE64_SOURCE +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <string.h> #include <unistd.h> +#include <f2fs_fs.h> + #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif @@ -21,7 +25,6 @@ #endif #include <time.h> -#include "config.h" #ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> #endif @@ -30,7 +33,6 @@ #define uuid_generate(a) #endif -#include "f2fs_fs.h" #include "quota.h" #include "f2fs_format_utils.h" diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c index b406bcf..1233f3a 100644 --- a/tools/f2fscrypt.c +++ b/tools/f2fscrypt.c @@ -21,6 +21,8 @@ #endif #include "config.h" +#include <f2fs_fs.h> + #include <assert.h> #include <errno.h> #include <getopt.h> @@ -44,8 +46,6 @@ #include <linux/fs.h> #endif -#include <f2fs_fs.h> - #ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> #else |