aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2023-07-17 11:16:38 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2023-07-17 19:41:27 -0700
commit5d01533b2abeea3e5bd2ffb637fcfdf2785d1c23 (patch)
tree4cb2e061e6b6480f0c0347fbad39532df3fd2cf1
parenta35353d208cfcec722392c44639686c6ec805ae7 (diff)
downloadf2fs-tools-5d01533b2abeea3e5bd2ffb637fcfdf2785d1c23.tar.gz
f2fs-tools: quick fix for Android build
In file included from external/f2fs-tools/lib/nls_utf8.c:29: external/f2fs-tools/include/f2fs_fs.h:1781:44: error: call to undeclared function 'S_ISDIR'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] raw_node->i.i_current_depth = cpu_to_le32(S_ISDIR(mode) ? 1 : 0); Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--include/f2fs_fs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index 2f63259..7e7db22 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -1359,7 +1359,9 @@ enum FILE_TYPE {
#define LINUX_S_IFMT 00170000
#define LINUX_S_IFREG 0100000
+#define LINUX_S_IFDIR 0040000
#define LINUX_S_ISREG(m) (((m) & LINUX_S_IFMT) == LINUX_S_IFREG)
+#define LINUX_S_ISDIR(m) (((m) & LINUX_S_IFMT) == LINUX_S_IFDIR)
/* from f2fs/segment.h */
enum {
@@ -1778,10 +1780,10 @@ static inline void f2fs_init_inode(struct f2fs_super_block *sb,
raw_node->i.i_generation = 0;
raw_node->i.i_xattr_nid = 0;
raw_node->i.i_flags = 0;
- raw_node->i.i_current_depth = cpu_to_le32(S_ISDIR(mode) ? 1 : 0);
+ raw_node->i.i_current_depth = cpu_to_le32(LINUX_S_ISDIR(mode) ? 1 : 0);
raw_node->i.i_dir_level = DEF_DIR_LEVEL;
raw_node->i.i_mode = cpu_to_le16(mode);
- raw_node->i.i_links = cpu_to_le32(S_ISDIR(mode) ? 2 : 1);
+ raw_node->i.i_links = cpu_to_le32(LINUX_S_ISDIR(mode) ? 2 : 1);
/* for dentry block in directory */
raw_node->i.i_size = cpu_to_le64(1 << get_sb(log_blocksize));