summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-02-25 05:11:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-25 05:11:04 +0000
commit7a5d535cd219707056865caac88571305f99faac (patch)
tree585dde37df36623bdcb89252d0d142a9d006c0ff
parent76e9a180a85e8178cf8b130b8131363e459f22de (diff)
parent4d71bc5350a9715314e5d54b32fc4220a9e4787a (diff)
downloadsystem_core-7a5d535cd219707056865caac88571305f99faac.tar.gz
system_core-7a5d535cd219707056865caac88571305f99faac.tar.bz2
system_core-7a5d535cd219707056865caac88571305f99faac.zip
Merge "fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount"
-rw-r--r--fs_mgr/fs_mgr.cpp2
-rw-r--r--fs_mgr/include/fs_mgr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 25c41b96e..38bbe9805 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1020,7 +1020,7 @@ out:
* mount a tmpfs filesystem at the given point.
* return 0 on success, non-zero on failure.
*/
-int fs_mgr_do_tmpfs_mount(char *n_name)
+int fs_mgr_do_tmpfs_mount(const char *n_name)
{
int ret;
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index 52f27ab51..a5e5bebb9 100644
--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -106,7 +106,7 @@ int fs_mgr_mount_all(struct fstab *fstab, int mount_mode);
int fs_mgr_do_mount(struct fstab *fstab, const char *n_name, char *n_blk_device,
char *tmp_mount_point);
int fs_mgr_do_mount_one(struct fstab_rec *rec);
-int fs_mgr_do_tmpfs_mount(char *n_name);
+int fs_mgr_do_tmpfs_mount(const char *n_name);
int fs_mgr_unmount_all(struct fstab *fstab);
int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc,
char *real_blk_device, int size);