Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 808d4e3cfdcc52b19276175464f6dbca4df13b09

Authored by Al Viro
1 parent 4b2c551f77
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

consitify do_mount() arguments 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 10 changed files with 27 additions and 26 deletions Side-by-side Diff

... ... @@ -1640,7 +1640,7 @@
1640 1640 /*
1641 1641 * do loopback mount.
1642 1642 */
1643   -static int do_loopback(struct path *path, char *old_name,
  1643 +static int do_loopback(struct path *path, const char *old_name,
1644 1644 int recurse)
1645 1645 {
1646 1646 LIST_HEAD(umount_list);
... ... @@ -1764,7 +1764,7 @@
1764 1764 return 0;
1765 1765 }
1766 1766  
1767   -static int do_move_mount(struct path *path, char *old_name)
  1767 +static int do_move_mount(struct path *path, const char *old_name)
1768 1768 {
1769 1769 struct path old_path, parent_path;
1770 1770 struct mount *p;
... ... @@ -1917,8 +1917,8 @@
1917 1917 * create a new mount for userspace and request it to be added into the
1918 1918 * namespace's tree
1919 1919 */
1920   -static int do_new_mount(struct path *path, char *type, int flags,
1921   - int mnt_flags, char *name, void *data)
  1920 +static int do_new_mount(struct path *path, const char *type, int flags,
  1921 + int mnt_flags, const char *name, void *data)
1922 1922 {
1923 1923 struct vfsmount *mnt;
1924 1924 int err;
... ... @@ -2191,8 +2191,8 @@
2191 2191 * Therefore, if this magic number is present, it carries no information
2192 2192 * and must be discarded.
2193 2193 */
2194   -long do_mount(char *dev_name, char *dir_name, char *type_page,
2195   - unsigned long flags, void *data_page)
  2194 +long do_mount(const char *dev_name, const char *dir_name,
  2195 + const char *type_page, unsigned long flags, void *data_page)
2196 2196 {
2197 2197 struct path path;
2198 2198 int retval = 0;
... ... @@ -2075,7 +2075,7 @@
2075 2075 extern void kern_unmount(struct vfsmount *mnt);
2076 2076 extern int may_umount_tree(struct vfsmount *);
2077 2077 extern int may_umount(struct vfsmount *);
2078   -extern long do_mount(char *, char *, char *, unsigned long, void *);
  2078 +extern long do_mount(const char *, const char *, const char *, unsigned long, void *);
2079 2079 extern struct vfsmount *collect_mounts(struct path *);
2080 2080 extern void drop_collected_mounts(struct vfsmount *);
2081 2081 extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *,
include/linux/security.h
Diff comments   View file @ 808d4e3
... ... @@ -1411,8 +1411,8 @@
1411 1411 int (*sb_kern_mount) (struct super_block *sb, int flags, void *data);
1412 1412 int (*sb_show_options) (struct seq_file *m, struct super_block *sb);
1413 1413 int (*sb_statfs) (struct dentry *dentry);
1414   - int (*sb_mount) (char *dev_name, struct path *path,
1415   - char *type, unsigned long flags, void *data);
  1414 + int (*sb_mount) (const char *dev_name, struct path *path,
  1415 + const char *type, unsigned long flags, void *data);
1416 1416 int (*sb_umount) (struct vfsmount *mnt, int flags);
1417 1417 int (*sb_pivotroot) (struct path *old_path,
1418 1418 struct path *new_path);
... ... @@ -1694,8 +1694,8 @@
1694 1694 int security_sb_kern_mount(struct super_block *sb, int flags, void *data);
1695 1695 int security_sb_show_options(struct seq_file *m, struct super_block *sb);
1696 1696 int security_sb_statfs(struct dentry *dentry);
1697   -int security_sb_mount(char *dev_name, struct path *path,
1698   - char *type, unsigned long flags, void *data);
  1697 +int security_sb_mount(const char *dev_name, struct path *path,
  1698 + const char *type, unsigned long flags, void *data);
1699 1699 int security_sb_umount(struct vfsmount *mnt, int flags);
1700 1700 int security_sb_pivotroot(struct path *old_path, struct path *new_path);
1701 1701 int security_sb_set_mnt_opts(struct super_block *sb, struct security_mnt_opts *opts);
... ... @@ -1964,8 +1964,8 @@
1964 1964 return 0;
1965 1965 }
1966 1966  
1967   -static inline int security_sb_mount(char *dev_name, struct path *path,
1968   - char *type, unsigned long flags,
  1967 +static inline int security_sb_mount(const char *dev_name, struct path *path,
  1968 + const char *type, unsigned long flags,
1969 1969 void *data)
1970 1970 {
1971 1971 return 0;
security/capability.c
Diff comments   View file @ 808d4e3
... ... @@ -74,8 +74,8 @@
74 74 return 0;
75 75 }
76 76  
77   -static int cap_sb_mount(char *dev_name, struct path *path, char *type,
78   - unsigned long flags, void *data)
  77 +static int cap_sb_mount(const char *dev_name, struct path *path,
  78 + const char *type, unsigned long flags, void *data)
79 79 {
80 80 return 0;
81 81 }
... ... @@ -276,8 +276,8 @@
276 276 return security_ops->sb_statfs(dentry);
277 277 }
278 278  
279   -int security_sb_mount(char *dev_name, struct path *path,
280   - char *type, unsigned long flags, void *data)
  279 +int security_sb_mount(const char *dev_name, struct path *path,
  280 + const char *type, unsigned long flags, void *data)
281 281 {
282 282 return security_ops->sb_mount(dev_name, path, type, flags, data);
283 283 }
security/selinux/hooks.c
Diff comments   View file @ 808d4e3
... ... @@ -2452,9 +2452,9 @@
2452 2452 return superblock_has_perm(cred, dentry->d_sb, FILESYSTEM__GETATTR, &ad);
2453 2453 }
2454 2454  
2455   -static int selinux_mount(char *dev_name,
  2455 +static int selinux_mount(const char *dev_name,
2456 2456 struct path *path,
2457   - char *type,
  2457 + const char *type,
2458 2458 unsigned long flags,
2459 2459 void *data)
2460 2460 {
security/smack/smack_lsm.c
Diff comments   View file @ 808d4e3
... ... @@ -408,8 +408,8 @@
408 408 * Returns 0 if current can write the floor of the filesystem
409 409 * being mounted on, an error code otherwise.
410 410 */
411   -static int smack_sb_mount(char *dev_name, struct path *path,
412   - char *type, unsigned long flags, void *data)
  411 +static int smack_sb_mount(const char *dev_name, struct path *path,
  412 + const char *type, unsigned long flags, void *data)
413 413 {
414 414 struct superblock_smack *sbp = path->dentry->d_sb->s_security;
415 415 struct smk_audit_info ad;
security/tomoyo/common.h
Diff comments   View file @ 808d4e3
... ... @@ -970,7 +970,7 @@
970 970 const u8 index);
971 971 int tomoyo_mkdev_perm(const u8 operation, struct path *path,
972 972 const unsigned int mode, unsigned int dev);
973   -int tomoyo_mount_permission(char *dev_name, struct path *path,
  973 +int tomoyo_mount_permission(const char *dev_name, struct path *path,
974 974 const char *type, unsigned long flags,
975 975 void *data_page);
976 976 int tomoyo_open_control(const u8 type, struct file *file);
security/tomoyo/mount.c
Diff comments   View file @ 808d4e3
... ... @@ -71,7 +71,8 @@
71 71 *
72 72 * Caller holds tomoyo_read_lock().
73 73 */
74   -static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
  74 +static int tomoyo_mount_acl(struct tomoyo_request_info *r,
  75 + const char *dev_name,
75 76 struct path *dir, const char *type,
76 77 unsigned long flags)
77 78 {
... ... @@ -183,7 +184,7 @@
183 184 *
184 185 * Returns 0 on success, negative value otherwise.
185 186 */
186   -int tomoyo_mount_permission(char *dev_name, struct path *path,
  187 +int tomoyo_mount_permission(const char *dev_name, struct path *path,
187 188 const char *type, unsigned long flags,
188 189 void *data_page)
189 190 {
security/tomoyo/tomoyo.c
Diff comments   View file @ 808d4e3
... ... @@ -408,8 +408,8 @@
408 408 *
409 409 * Returns 0 on success, negative value otherwise.
410 410 */
411   -static int tomoyo_sb_mount(char *dev_name, struct path *path,
412   - char *type, unsigned long flags, void *data)
  411 +static int tomoyo_sb_mount(const char *dev_name, struct path *path,
  412 + const char *type, unsigned long flags, void *data)
413 413 {
414 414 return tomoyo_mount_permission(dev_name, path, type, flags, data);
415 415 }