Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

consitify do_mount() arguments

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 808d4e3cfd)
This commit is contained in:
Al Viro 2012-10-11 11:42:01 -04:00 committed by Thierry Strudel
parent 57e87fa69d
commit 5f453c9b7c
10 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/namespace.c
View file

@ -1583,7 +1583,7 @@ static int do_change_type(struct path *path, int flag)
/* /*
* do loopback mount. * do loopback mount.
*/ */
static int do_loopback(struct path *path, char *old_name, static int do_loopback(struct path *path, const char *old_name,
int recurse) int recurse)
{ {
LIST_HEAD(umount_list); LIST_HEAD(umount_list);
@ -1707,7 +1707,7 @@ static inline int tree_contains_unbindable(struct mount *mnt)
return 0; return 0;
} }
static int do_move_mount(struct path *path, char *old_name) static int do_move_mount(struct path *path, const char *old_name)
{ {
struct path old_path, parent_path; struct path old_path, parent_path;
struct mount *p; struct mount *p;
@ -1860,8 +1860,8 @@ unlock:
* create a new mount for userspace and request it to be added into the * create a new mount for userspace and request it to be added into the
* namespace's tree * namespace's tree
*/ */
static int do_new_mount(struct path *path, char *type, int flags, static int do_new_mount(struct path *path, const char *type, int flags,
int mnt_flags, char *name, void *data) int mnt_flags, const char *name, void *data)
{ {
struct vfsmount *mnt; struct vfsmount *mnt;
int err; int err;
@ -2134,8 +2134,8 @@ int copy_mount_string(const void __user *data, char **where)
* Therefore, if this magic number is present, it carries no information * Therefore, if this magic number is present, it carries no information
* and must be discarded. * and must be discarded.
*/ */
long do_mount(char *dev_name, char *dir_name, char *type_page, long do_mount(const char *dev_name, const char *dir_name,
unsigned long flags, void *data_page) const char *type_page, unsigned long flags, void *data_page)
{ {
struct path path; struct path path;
int retval = 0; int retval = 0;

2
include/linux/fs.h
View file

@ -1903,7 +1903,7 @@ extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data);
extern void kern_unmount(struct vfsmount *mnt); extern void kern_unmount(struct vfsmount *mnt);
extern int may_umount_tree(struct vfsmount *); extern int may_umount_tree(struct vfsmount *);
extern int may_umount(struct vfsmount *); extern int may_umount(struct vfsmount *);
extern long do_mount(char *, char *, char *, unsigned long, void *); extern long do_mount(const char *, const char *, const char *, unsigned long, void *);
extern struct vfsmount *collect_mounts(struct path *); extern struct vfsmount *collect_mounts(struct path *);
extern void drop_collected_mounts(struct vfsmount *); extern void drop_collected_mounts(struct vfsmount *);
extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *, extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,

12
include/linux/security.h
View file

@ -1418,8 +1418,8 @@ struct security_operations {
int (*sb_kern_mount) (struct super_block *sb, int flags, void *data); int (*sb_kern_mount) (struct super_block *sb, int flags, void *data);
int (*sb_show_options) (struct seq_file *m, struct super_block *sb); int (*sb_show_options) (struct seq_file *m, struct super_block *sb);
int (*sb_statfs) (struct dentry *dentry); int (*sb_statfs) (struct dentry *dentry);
int (*sb_mount) (char *dev_name, struct path *path, int (*sb_mount) (const char *dev_name, struct path *path,
char *type, unsigned long flags, void *data); const char *type, unsigned long flags, void *data);
int (*sb_umount) (struct vfsmount *mnt, int flags); int (*sb_umount) (struct vfsmount *mnt, int flags);
int (*sb_pivotroot) (struct path *old_path, int (*sb_pivotroot) (struct path *old_path,
struct path *new_path); struct path *new_path);
@ -1705,8 +1705,8 @@ int security_sb_remount(struct super_block *sb, void *data);
int security_sb_kern_mount(struct super_block *sb, int flags, void *data); int security_sb_kern_mount(struct super_block *sb, int flags, void *data);
int security_sb_show_options(struct seq_file *m, struct super_block *sb); int security_sb_show_options(struct seq_file *m, struct super_block *sb);
int security_sb_statfs(struct dentry *dentry); int security_sb_statfs(struct dentry *dentry);
int security_sb_mount(char *dev_name, struct path *path, int security_sb_mount(const char *dev_name, struct path *path,
char *type, unsigned long flags, void *data); const char *type, unsigned long flags, void *data);
int security_sb_umount(struct vfsmount *mnt, int flags); int security_sb_umount(struct vfsmount *mnt, int flags);
int security_sb_pivotroot(struct path *old_path, struct path *new_path); int security_sb_pivotroot(struct path *old_path, struct path *new_path);
int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts); int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
@ -1995,8 +1995,8 @@ static inline int security_sb_statfs(struct dentry *dentry)
return 0; return 0;
} }
static inline int security_sb_mount(char *dev_name, struct path *path, static inline int security_sb_mount(const char *dev_name, struct path *path,
char *type, unsigned long flags, const char *type, unsigned long flags,
void *data) void *data)
{ {
return 0; return 0;

4
security/capability.c
View file

@ -94,8 +94,8 @@ static int cap_sb_statfs(struct dentry *dentry)
return 0; return 0;
} }
static int cap_sb_mount(char *dev_name, struct path *path, char *type, static int cap_sb_mount(const char *dev_name, struct path *path,
unsigned long flags, void *data) const char *type, unsigned long flags, void *data)
{ {
return 0; return 0;
} }

4
security/security.c
View file

@ -280,8 +280,8 @@ int security_sb_statfs(struct dentry *dentry)
return security_ops->sb_statfs(dentry); return security_ops->sb_statfs(dentry);
} }
int security_sb_mount(char *dev_name, struct path *path, int security_sb_mount(const char *dev_name, struct path *path,
char *type, unsigned long flags, void *data) const char *type, unsigned long flags, void *data)
{ {
return security_ops->sb_mount(dev_name, path, type, flags, data); return security_ops->sb_mount(dev_name, path, type, flags, data);
} }

4
security/selinux/hooks.c
View file

@ -2627,9 +2627,9 @@ static int selinux_sb_statfs(struct dentry *dentry)
return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad); return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad);
} }
static int selinux_mount(char *dev_name, static int selinux_mount(const char *dev_name,
struct path *path, struct path *path,
char *type, const char *type,
unsigned long flags, unsigned long flags,
void *data) void *data)
{ {

4
security/smack/smack_lsm.c
View file

@ -406,8 +406,8 @@ static int smack_sb_statfs(struct dentry *dentry)
* Returns 0 if current can write the floor of the filesystem * Returns 0 if current can write the floor of the filesystem
* being mounted on, an error code otherwise. * being mounted on, an error code otherwise.
*/ */
static int smack_sb_mount(char *dev_name, struct path *path, static int smack_sb_mount(const char *dev_name, struct path *path,
char *type, unsigned long flags, void *data) const char *type, unsigned long flags, void *data)
{ {
struct superblock_smack *sbp = path->dentry->d_sb->s_security; struct superblock_smack *sbp = path->dentry->d_sb->s_security;
struct smk_audit_info ad; struct smk_audit_info ad;

2
security/tomoyo/common.h
View file

@ -971,7 +971,7 @@ int tomoyo_init_request_info(struct tomoyo_request_info *r,
const u8 index); const u8 index);
int tomoyo_mkdev_perm(const u8 operation, struct path *path, int tomoyo_mkdev_perm(const u8 operation, struct path *path,
const unsigned int mode, unsigned int dev); const unsigned int mode, unsigned int dev);
int tomoyo_mount_permission(char *dev_name, struct path *path, int tomoyo_mount_permission(const char *dev_name, struct path *path,
const char *type, unsigned long flags, const char *type, unsigned long flags,
void *data_page); void *data_page);
int tomoyo_open_control(const u8 type, struct file *file); int tomoyo_open_control(const u8 type, struct file *file);

5
security/tomoyo/mount.c
View file

@ -71,7 +71,8 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r,
* *
* Caller holds tomoyo_read_lock(). * Caller holds tomoyo_read_lock().
*/ */
static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name, static int tomoyo_mount_acl(struct tomoyo_request_info *r,
const char *dev_name,
struct path *dir, const char *type, struct path *dir, const char *type,
unsigned long flags) unsigned long flags)
{ {
@ -183,7 +184,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
int tomoyo_mount_permission(char *dev_name, struct path *path, int tomoyo_mount_permission(const char *dev_name, struct path *path,
const char *type, unsigned long flags, const char *type, unsigned long flags,
void *data_page) void *data_page)
{ {

4
security/tomoyo/tomoyo.c
View file

@ -406,8 +406,8 @@ static int tomoyo_path_chroot(struct path *path)
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
static int tomoyo_sb_mount(char *dev_name, struct path *path, static int tomoyo_sb_mount(const char *dev_name, struct path *path,
char *type, unsigned long flags, void *data) const char *type, unsigned long flags, void *data)
{ {
return tomoyo_mount_permission(dev_name, path, type, flags, data); return tomoyo_mount_permission(dev_name, path, type, flags, data);
} }