diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-02 10:52:56 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-02 11:07:33 -0700 |
| commit | a6a7ac8e9db8f834bdf517394b90f6503c412b9f (patch) | |
| tree | 4437f8b65f8015191503c8bc196a8e8d0b4086e6 | |
| parent | 7d96d138a3788f9b951849ae2910e77a59dd9535 (diff) | |
| download | android_external_f2fs-tools-a6a7ac8e9db8f834bdf517394b90f6503c412b9f.tar.gz android_external_f2fs-tools-a6a7ac8e9db8f834bdf517394b90f6503c412b9f.tar.bz2 android_external_f2fs-tools-a6a7ac8e9db8f834bdf517394b90f6503c412b9f.zip | |
fsck.f2fs: avoid build warnings
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/dump.c | 4 | ||||
| -rw-r--r-- | fsck/fsck.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/fsck/dump.c b/fsck/dump.c index 54f9a52..4bb906f 100644 --- a/fsck/dump.c +++ b/fsck/dump.c @@ -140,8 +140,8 @@ static void dump_node_blk(struct f2fs_sb_info *sbi, int ntype, { struct node_info ni; struct f2fs_node *node_blk; - u32 idx, skip = 0; - int i; + u32 skip = 0; + u32 i, idx; switch (ntype) { case TYPE_DIRECT_NODE: diff --git a/fsck/fsck.c b/fsck/fsck.c index 560b541..3fd9784 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -454,12 +454,13 @@ check: (u32)i_blocks); if (i_blocks != *blk_cnt) { - ASSERT_MSG("ino: 0x%x has i_blocks: %lu, but has %u blocks", + ASSERT_MSG("ino: 0x%x has i_blocks: %08"PRIx64", " + "but has %u blocks", nid, i_blocks, *blk_cnt); if (config.fix_cnt) { node_blk->i.i_blocks = cpu_to_le64(*blk_cnt); need_fix = 1; - FIX_MSG("[0x%x] i_blocks=0x%lx -> 0x%x", + FIX_MSG("[0x%x] i_blocks=0x%08"PRIx64" -> 0x%x", nid, i_blocks, *blk_cnt); } } @@ -788,7 +789,7 @@ void fsck_init(struct f2fs_sb_info *sbi) static void fix_nat_entries(struct f2fs_sb_info *sbi) { struct f2fs_fsck *fsck = F2FS_FSCK(sbi); - int i; + u32 i; for (i = 0; i < fsck->nr_nat_entries; i++) if (f2fs_test_bit(i, fsck->nat_area_bitmap) != 0) @@ -801,7 +802,8 @@ static void fix_checkpoint(struct f2fs_sb_info *sbi) struct f2fs_super_block *raw_sb = sbi->raw_super; struct f2fs_checkpoint *ckp = F2FS_CKPT(sbi); unsigned long long cp_blk_no; - int i, ret; + u32 i; + int ret; u_int32_t crc = 0; ckp->ckpt_flags = cpu_to_le32(CP_UMOUNT_FLAG); |