diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-03-03 10:51:58 -0800 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-03-03 23:59:07 +0000 |
| commit | 40ce87a70a064eeb462d3c3935422918c1f6114e (patch) | |
| tree | 54a5c9fcd430befffff9bdcb4a4aed1a2566d97c /ext4_utils/make_ext4fs.c | |
| parent | da0703c0df9e1a14ec2edf14a286badff70dc8cc (diff) | |
| download | extras-40ce87a70a064eeb462d3c3935422918c1f6114e.tar.gz | |
Remove warnings
Remove warnings called by duplicate definition of ALIGN macro.
Note that bionic/libc/include/sys/param.h defines ALIGN as
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
which is not good - clashes with every other definition of ALIGN.
Change-Id: I2d716c41ededd2fa072f944e21d94a0c93ca9c46
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index 1c254571..d8d2e11a 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -334,7 +334,7 @@ static u32 compute_inodes_per_group() u32 blocks = DIV_ROUND_UP(info.len, info.block_size); u32 block_groups = DIV_ROUND_UP(blocks, info.blocks_per_group); u32 inodes = DIV_ROUND_UP(info.inodes, block_groups); - inodes = ALIGN(inodes, (info.block_size / info.inode_size)); + inodes = EXT4_ALIGN(inodes, (info.block_size / info.inode_size)); /* After properly rounding up the number of inodes/group, * make sure to update the total inodes field in the info struct. |