Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0

Conflicts:
	Android.mk
	VERSION
	fsck/dump.c
	fsck/f2fs.h
	fsck/fsck.c
	fsck/main.c
	fsck/mount.c
	include/f2fs_fs.h
	include/f2fs_version.h
	lib/libf2fs.c
	mkfs/Makefile.am
	mkfs/f2fs_format.c
	mkfs/f2fs_format_utils.c
	mkfs/f2fs_format_utils.h
	tools/f2fstat.c
	tools/fibmap.c

Change-Id: I5cc044a6fe47bac6cab8d845f8d63729f765de50

1 files changed, 23 insertions, 8 deletions

diff --git a/tools/fibmap.c b/tools/fibmap.c
index 8790145..ce30850 100644
--- a/tools/fibmap.c
+++ b/tools/fibmap.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <libgen.h>
@@ -12,7 +13,9 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 
+#ifdef ANDROID
 #include "include/f2fs_version.h"
+#endif
 
 struct file_ext {
 	__u32 f_pos;
@@ -30,18 +33,22 @@ void print_ext(struct file_ext *ext)
 					ext->end_blk, ext->blk_count);
 }
 
+#ifndef ANDROID
+void print_stat(struct stat64 *st)
+#else
 void fibmap_print_stat(struct stat64 *st)
+#endif
 {
 	printf("--------------------------------------------\n");
 	printf("dev       [%d:%d]\n", major(st->st_dev), minor(st->st_dev));
-	printf("ino       [0x%8llx : %lld]\n", st->st_ino, st->st_ino);
+	printf("ino       [0x%8lx : %ld]\n", st->st_ino, st->st_ino);
 	printf("mode      [0x%8x : %d]\n", st->st_mode, st->st_mode);
-	printf("nlink     [0x%8x : %d]\n", st->st_nlink, st->st_nlink);
-	printf("uid       [0x%8lx : %ld]\n", st->st_uid, st->st_uid);
-	printf("gid       [0x%8lx : %ld]\n", st->st_gid, st->st_gid);
-	printf("size      [0x%8llx : %lld]\n", st->st_size, st->st_size);
+	printf("nlink     [0x%8lx : %ld]\n", st->st_nlink, st->st_nlink);
+	printf("uid       [0x%8x : %d]\n", st->st_uid, st->st_uid);
+	printf("gid       [0x%8x : %d]\n", st->st_gid, st->st_gid);
+	printf("size      [0x%8lx : %ld]\n", st->st_size, st->st_size);
 	printf("blksize   [0x%8lx : %ld]\n", st->st_blksize, st->st_blksize);
-	printf("blocks    [0x%8llx : %lld]\n", st->st_blocks, st->st_blocks);
+	printf("blocks    [0x%8lx : %ld]\n", st->st_blocks, st->st_blocks);
 	printf("--------------------------------------------\n\n");
 }
 
@@ -81,7 +88,11 @@ out:
 
 }
 
+#ifndef ANDROID
+int main(int argc, char *argv[])
+#else
 int fibmap_main(int argc, char *argv[])
+#endif
 {
 	int fd;
 	int ret = 0;
@@ -94,8 +105,8 @@ int fibmap_main(int argc, char *argv[])
 	__u32 blknum;
 
 	printf("\n\tF2FS-tools: fibmap.f2fs Ver: %s (%s)\n\n",
-				F2FS_TOOLS_VERSION,
-				F2FS_TOOLS_DATE);
+	    F2FS_TOOLS_VERSION, F2FS_TOOLS_DATE);
+
 	if (argc != 2) {
 		fprintf(stderr, "No filename\n");
 		exit(-1);
@@ -123,7 +134,11 @@ int fibmap_main(int argc, char *argv[])
 
 	printf("\n----------------file info-------------------\n");
 	printf("%s :\n", filename);
+#ifndef ANDROID
+	print_stat(&st);
+#else
 	fibmap_print_stat(&st);
+#endif
 	printf("file_pos   start_blk     end_blk        blks\n");
 
 	blknum = 0;