All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [f2fs-dev] [PATCH] f2fs-tools: move android_config before defining them
Date: Sat, 21 May 2022 23:03:00 -0700	[thread overview]
Message-ID: <20220522060300.94891-1-jaegeuk@kernel.org> (raw)

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fsck/f2fs.h        | 4 ++--
 fsck/xattr.h       | 2 ++
 mkfs/f2fs_format.c | 6 ++++--
 tools/f2fscrypt.c  | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index 875f953fb6cc..030d75067a8e 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 4e4b50d47bd7..74aa5418cbd3 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 2759b5a03bc4..3b96d3182ac8 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 b406bcf56640..1233f3a5b103 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
-- 
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

                 reply	other threads:[~2022-05-22  6:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220522060300.94891-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.