aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-06-30 13:57:17 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2014-07-03 09:27:47 -0700
commit58edb106a8b47d2ed693ab41f63b314dc2882ecd (patch)
treeed3a6be112f7a86af4cb6a8b8d3434163e47c9de
parente91da2f664a765a5bd2bde7d47efe7c8b957ebb9 (diff)
downloadandroid_external_f2fs-tools-58edb106a8b47d2ed693ab41f63b314dc2882ecd.tar.gz
android_external_f2fs-tools-58edb106a8b47d2ed693ab41f63b314dc2882ecd.tar.bz2
android_external_f2fs-tools-58edb106a8b47d2ed693ab41f63b314dc2882ecd.zip
f2fs-tools: 64-bit compile issue
Signed-off-by: Mark Salyzyn <salyzyn@google.com> Change-Id: I9398b877571d3dabbcb29c87a67d59672ea7fbaa Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-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);