aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2021-08-23 11:38:23 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2021-08-23 11:42:56 -0700
commit3fd996cc162bc8d7383fb556ca6356a3eb71609d (patch)
treee1691f7523e44ad5e5d5f5e8547ce7d9c2044ccf
parent1edc138ae758b15c50657ddcc42f07567ba03f86 (diff)
downloadf2fs-tools-3fd996cc162bc8d7383fb556ca6356a3eb71609d.tar.gz
Avoid redefined ALIGN_UP
This tries to avoid build warning. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--include/f2fs_fs.h4
-rw-r--r--lib/libf2fs.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index ea55ee8..2a9c116 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -437,8 +437,8 @@ typedef struct {
filter_ops *filter_ops; /* filter ops */
} compress_config_t;
-#define ALIGN_UP(value, size) ((value) + ((value) % (size) > 0 ? \
- (size) - (value) % (size) : 0))
+#define ALIGN_DOWN(addrs, size) (((addrs) / (size)) * (size))
+#define ALIGN_UP(addrs, size) ALIGN_DOWN(((addrs) + (size) - 1), (size))
struct f2fs_configuration {
u_int32_t reserved_segments;
diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index c6ab329..b27785d 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -499,8 +499,6 @@ opaque_seq:
return __f2fs_dentry_hash(name, len);
}
-#define ALIGN_DOWN(addrs, size) (((addrs) / (size)) * (size))
-#define ALIGN_UP(addrs, size) ALIGN_DOWN(((addrs) + (size) - 1), (size))
unsigned int addrs_per_inode(struct f2fs_inode *i)
{
unsigned int addrs = CUR_ADDRS_PER_INODE(i) - get_inline_xattr_addrs(i);