aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-09-09 00:11:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-09 00:11:17 +0000
commit6a641fecc45a700ec5651f48a73c8b02dac9df24 (patch)
tree1bb1c6302d81cb3e16039ac24edb5d894f2b2f54
parentfc24ac8347630a14d62ffafa93a27ec3b81cc44b (diff)
parentc246ccf8447c47801ae0912ca356831a18c77895 (diff)
downloadf2fs-tools-6a641fecc45a700ec5651f48a73c8b02dac9df24.tar.gz
am c246ccf8: f2fs-tools: 64-bit compile issue
* commit 'c246ccf8447c47801ae0912ca356831a18c77895': f2fs-tools: 64-bit compile issue
-rw-r--r--fsck/dump.c4
-rw-r--r--fsck/mount.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/fsck/dump.c b/fsck/dump.c
index 765e9db..880e78a 100644
--- a/fsck/dump.c
+++ b/fsck/dump.c
@@ -8,6 +8,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <inttypes.h>
+
#include "fsck.h"
#define BUF_SZ 80
@@ -57,7 +59,7 @@ void sit_dump(struct f2fs_sb_info *sbi, int start_sit, int end_sit)
ASSERT(ret >= 0);
close(fd);
- DBG(1, "Blocks [0x%lx] Free Segs [0x%x]\n", valid_blocks, free_segs);
+ DBG(1, "Blocks [0x%" PRIx64 "] Free Segs [0x%x]\n", valid_blocks, free_segs);
}
void ssa_dump(struct f2fs_sb_info *sbi, int start_ssa, int end_ssa)
diff --git a/fsck/mount.c b/fsck/mount.c
index 5d3231f..7ea3296 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -355,7 +355,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)
memcpy(sbi->ckpt, cur_page, blk_size);
if (cp_blks > 1) {
- int i;
+ unsigned int i;
unsigned long long cp_blk_no;
cp_blk_no = le32_to_cpu(raw_sb->cp_blkaddr);