[f2fs-dev] [PATCH 1/2] f2fs-tools: adjust config file first

[f2fs-dev] [PATCH 1/2] f2fs-tools: adjust config file first

[Jaegeuk Kim]

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

[f2fs-dev] [PATCH 2/2] android_config: add missing uuid library

[Jaegeuk Kim]

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 include/android_config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/android_config.h b/include/android_config.h
index 9a15782dc796..4bcd5890313f 100644
--- a/include/android_config.h
+++ b/include/android_config.h
@@ -23,6 +23,7 @@
 #define HAVE_SYS_SYSMACROS_H 1
 #define HAVE_SYS_XATTR_H 1
 #define HAVE_UNISTD_H 1
+#define HAVE_UUID_UUID_H 1
 #define HAVE_SCSI_SG_H 1
 
 #define HAVE_FALLOCATE 1
@@ -37,6 +38,7 @@
 #define HAVE_SETMNTENT 1
 #define HAVE_SPARSE_SPARSE_H 1
 #define HAVE_LIBLZ4 1
+#define HAVE_LIBUUID 1
 
 #ifdef WITH_SLOAD
 #define HAVE_LIBSELINUX 1
-- 
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

Re: [f2fs-dev] [PATCH 1/2 v2] f2fs-tools: adjust config file first

[Jaegeuk Kim]

We need to get the definitions first.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

 Change log from v1:
  - fix build problems

 tools/f2fscrypt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c
index 4c5d87036225..b406bcf56640 100644
--- a/tools/f2fscrypt.c
+++ b/tools/f2fscrypt.c
@@ -43,6 +43,9 @@
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #endif
+
+#include <f2fs_fs.h>
+
 #ifdef HAVE_UUID_UUID_H
 #include <uuid/uuid.h>
 #else
@@ -55,7 +58,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