Commit 808d4e3c authored by Al Viro's avatar Al Viro
Browse files

consitify do_mount() arguments 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4b2c551f

fs/namespace.c

+6 −6
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ static int do_change_type(struct path *path, int flag) 
/*

 * 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)

{

	LIST_HEAD(umount_list);
@@ -1764,7 +1764,7 @@ static inline int tree_contains_unbindable(struct mount *mnt) 
	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 mount *p;
@@ -1917,8 +1917,8 @@ unlock: 
 * create a new mount for userspace and request it to be added into the

 * namespace's tree

 */

static int do_new_mount(struct path *path, char *type, int flags,

			int mnt_flags, char *name, void *data)

static int do_new_mount(struct path *path, const char *type, int flags,

			int mnt_flags, const char *name, void *data)

{

	struct vfsmount *mnt;

	int err;
@@ -2191,8 +2191,8 @@ int copy_mount_string(const void __user *data, char **where) 
 * Therefore, if this magic number is present, it carries no information

 * and must be discarded.

 */

long do_mount(char *dev_name, char *dir_name, char *type_page,

		  unsigned long flags, void *data_page)

long do_mount(const char *dev_name, const char *dir_name,

		const char *type_page, unsigned long flags, void *data_page)

{

	struct path path;

	int retval = 0;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2075,7 +2075,7 @@ extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data); 
extern void kern_unmount(struct vfsmount *mnt);

extern int may_umount_tree(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 void drop_collected_mounts(struct vfsmount *);

extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,

include/linux/security.h

+6 −6
Original line number Diff line number Diff line
@@ -1411,8 +1411,8 @@ struct security_operations { 
	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_statfs) (struct dentry *dentry);

	int (*sb_mount) (char *dev_name, struct path *path,

			 char *type, unsigned long flags, void *data);

	int (*sb_mount) (const char *dev_name, struct path *path,

			 const char *type, unsigned long flags, void *data);

	int (*sb_umount) (struct vfsmount *mnt, int flags);

	int (*sb_pivotroot) (struct path *old_path,

			     struct path *new_path);
@@ -1694,8 +1694,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_show_options(struct seq_file *m, struct super_block *sb);

int security_sb_statfs(struct dentry *dentry);

int security_sb_mount(char *dev_name, struct path *path,

		      char *type, unsigned long flags, void *data);

int security_sb_mount(const char *dev_name, struct path *path,

		      const char *type, unsigned long flags, void *data);

int security_sb_umount(struct vfsmount *mnt, int flags);

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);
@@ -1964,8 +1964,8 @@ static inline int security_sb_statfs(struct dentry *dentry) 
	return 0;

}



static inline int security_sb_mount(char *dev_name, struct path *path,

				    char *type, unsigned long flags,

static inline int security_sb_mount(const char *dev_name, struct path *path,

				    const char *type, unsigned long flags,

				    void *data)

{

	return 0;

security/capability.c

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ static int cap_sb_statfs(struct dentry *dentry) 
	return 0;

}



static int cap_sb_mount(char *dev_name, struct path *path, char *type,

			unsigned long flags, void *data)

static int cap_sb_mount(const char *dev_name, struct path *path,

			const char *type, unsigned long flags, void *data)

{

	return 0;

}

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ int security_sb_statfs(struct dentry *dentry) 
	return security_ops->sb_statfs(dentry);

}



int security_sb_mount(char *dev_name, struct path *path,

                       char *type, unsigned long flags, void *data)

int security_sb_mount(const char *dev_name, struct path *path,

                       const char *type, unsigned long flags, void *data)

{

	return security_ops->sb_mount(dev_name, path, type, flags, data);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE