commit e666ccd6ab00d689819b537e51ab9b965f8a433a
author The Android Open Source Project <initial-contribution@android.com> Fri Oct 12 07:32:31 2012 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Oct 12 07:32:31 2012 -0700
tree 43610f1c7b55d3087eef3615f110d0ae616439c2
parent 796367ef31a7a1409f7ce5756f8142100d31053a
parent f5ccdc6d74c9445e8e81e16e14004bb3d6349a08

Reconcile with jb-mr1-release - do not merge

Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d

ext4_utils/make_ext4fs.c

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index be63e27..662da6d 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -323,8 +323,9 @@
 }
 
 int make_ext4fs_internal(int fd, const char *directory,
-                         char *mountpoint, fs_config_func_t fs_config_func, int gzip, int sparse,
-                         int crc, int wipe, int init_itabs, struct selabel_handle *sehnd)
+                         const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
+                         int sparse, int crc, int wipe, int init_itabs,
+                         struct selabel_handle *sehnd)
 {
 	u32 root_inode_num;
 	u16 root_mode;

ext4_utils/make_ext4fs.h

diff --git a/ext4_utils/make_ext4fs.h b/ext4_utils/make_ext4fs.h
index c217c3d..bfc008a 100644
--- a/ext4_utils/make_ext4fs.h
+++ b/ext4_utils/make_ext4fs.h
@@ -38,8 +38,9 @@
 int make_ext4fs(const char *filename, s64 len,
                 const char *mountpoint, struct selabel_handle *sehnd);
 int make_ext4fs_internal(int fd, const char *directory,
-                         char *mountpoint, fs_config_func_t fs_config_func, int gzip, int sparse,
-                         int crc, int wipe, int init_itabs, struct selabel_handle *sehnd);
+                         const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
+                         int sparse, int crc, int wipe, int init_itabs,
+                         struct selabel_handle *sehnd);
 
 #ifdef __cplusplus
 }