From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [f2fs-dev] [PATCH] libf2fs: fix build error on Windows
Date: Mon, 8 Jun 2020 11:38:25 -0700 [thread overview]
Message-ID: <20200608183825.126749-1-jaegeuk@kernel.org> (raw)
Windows doesn't support S_ISREG, so let's avoid depedency.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
include/f2fs_fs.h | 4 ++++
lib/libf2fs.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index 265f50c..709bfd8 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -1178,6 +1178,10 @@ enum FILE_TYPE {
F2FS_FT_LAST_FILE_TYPE = F2FS_FT_XATTR,
};
+#define LINUX_S_IFMT 00170000
+#define LINUX_S_IFREG 0100000
+#define LINUX_S_ISREG(m) (((m) & LINUX_S_IFMT) == LINUX_S_IFREG)
+
/* from f2fs/segment.h */
enum {
LFS = 0,
diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index c2960fd..55d3a5c 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -504,7 +504,7 @@ unsigned int addrs_per_inode(struct f2fs_inode *i)
{
unsigned int addrs = CUR_ADDRS_PER_INODE(i) - get_inline_xattr_addrs(i);
- if (!S_ISREG(le16_to_cpu(i->i_mode)) ||
+ if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) ||
!(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL))
return addrs;
return ALIGN_DOWN(addrs, 1 << i->i_log_cluster_size);
@@ -512,7 +512,7 @@ unsigned int addrs_per_inode(struct f2fs_inode *i)
unsigned int addrs_per_block(struct f2fs_inode *i)
{
- if (!S_ISREG(le16_to_cpu(i->i_mode)) ||
+ if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) ||
!(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL))
return DEF_ADDRS_PER_BLOCK;
return ALIGN_DOWN(DEF_ADDRS_PER_BLOCK, 1 << i->i_log_cluster_size);
--
2.27.0.278.ge193c7cf3a9-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
reply other threads:[~2020-06-08 18:38 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=20200608183825.126749-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).