From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [f2fs-dev] [PATCH 1/2] f2fs-tools: adjust config file first
Date: Thu, 19 May 2022 16:46:04 -0700 [thread overview]
Message-ID: <20220519234605.633645-1-jaegeuk@kernel.org> (raw)
We need to get the definitions first.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fsck/f2fs.h | 5 +++--
mkfs/f2fs_format.c | 5 +++--
tools/f2fscrypt.c | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index 875f953fb6cc..f1f867339abd 100644
--- a/fsck/f2fs.h
+++ b/fsck/f2fs.h
@@ -11,6 +11,9 @@
#ifndef _F2FS_H_
#define _F2FS_H_
+#include "config.h"
+#include <f2fs_fs.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
@@ -35,8 +38,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/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 2759b5a03bc4..df6fa8a9381b 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -8,6 +8,9 @@
*/
#define _LARGEFILE64_SOURCE
+#include "config.h"
+#include <f2fs_fs.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
@@ -21,7 +24,6 @@
#endif
#include <time.h>
-#include "config.h"
#ifdef HAVE_UUID_UUID_H
#include <uuid/uuid.h>
#endif
@@ -30,7 +32,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 4c5d87036225..0d916c1b1f25 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>
@@ -55,7 +57,6 @@ typedef unsigned char uuid_t[16];
#ifdef HAVE_SYS_KEY_H
#include <sys/key.h>
#endif
-#include <f2fs_fs.h>
#define F2FS_MAX_KEY_SIZE 64
#define F2FS_MAX_PASSPHRASE_SIZE 1024
--
2.36.1.124.g0e6072fb45-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next reply other threads:[~2022-05-19 23:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 23:46 Jaegeuk Kim [this message]
2022-05-19 23:46 ` [f2fs-dev] [PATCH 2/2] android_config: add missing uuid library Jaegeuk Kim
2022-05-20 0:19 ` [f2fs-dev] [PATCH 1/2 v2] f2fs-tools: adjust config file first Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220519234605.633645-1-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).