Merge branch 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull 'struct path' constification update from Al Viro:
 "'struct path' is passed by reference to a bunch of Linux security
  methods; in theory, there's nothing to stop them from modifying the
  damn thing and LSM community being what it is, sooner or later some
  enterprising soul is going to decide that it's a good idea.

  Let's remove the temptation and constify all of those..."

* 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  constify ima_d_path()
  constify security_sb_pivotroot()
  constify security_path_chroot()
  constify security_path_{link,rename}
  apparmor: remove useless checks for NULL ->mnt
  constify security_path_{mkdir,mknod,symlink}
  constify security_path_{unlink,rmdir}
  apparmor: constify common_perm_...()
  apparmor: constify aa_path_link()
  apparmor: new helper - common_path_perm()
  constify chmod_common/security_path_chmod
  constify security_sb_mount()
  constify chown_common/security_path_chown
  tomoyo: constify assorted struct path *
  apparmor_path_truncate(): path->mnt is never NULL
  constify vfs_truncate()
  constify security_path_truncate()
  [apparmor] constify struct path * in a bunch of helpers

1 files changed, 14 insertions, 14 deletions

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 41ab4662f95c..512fd000562b 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1344,10 +1344,10 @@ union security_list_options {
         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)(const char *dev_name, struct path *path,
+        int (*sb_mount)(const char *dev_name, const 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);
+        int (*sb_pivotroot)(const struct path *old_path, const struct path *new_path);
         int (*sb_set_mnt_opts)(struct super_block *sb,
                                 struct security_mnt_opts *opts,
                                 unsigned long kern_flags,
@@ -1361,23 +1361,23 @@ union security_list_options {
 
 
 #ifdef CONFIG_SECURITY_PATH
-        int (*path_unlink)(struct path *dir, struct dentry *dentry);
-        int (*path_mkdir)(struct path *dir, struct dentry *dentry,
+        int (*path_unlink)(const struct path *dir, struct dentry *dentry);
+        int (*path_mkdir)(const struct path *dir, struct dentry *dentry,
                                 umode_t mode);
-        int (*path_rmdir)(struct path *dir, struct dentry *dentry);
-        int (*path_mknod)(struct path *dir, struct dentry *dentry,
+        int (*path_rmdir)(const struct path *dir, struct dentry *dentry);
+        int (*path_mknod)(const struct path *dir, struct dentry *dentry,
                                 umode_t mode, unsigned int dev);
-        int (*path_truncate)(struct path *path);
-        int (*path_symlink)(struct path *dir, struct dentry *dentry,
+        int (*path_truncate)(const struct path *path);
+        int (*path_symlink)(const struct path *dir, struct dentry *dentry,
                                 const char *old_name);
-        int (*path_link)(struct dentry *old_dentry, struct path *new_dir,
+        int (*path_link)(struct dentry *old_dentry, const struct path *new_dir,
                                 struct dentry *new_dentry);
-        int (*path_rename)(struct path *old_dir, struct dentry *old_dentry,
-                                struct path *new_dir,
+        int (*path_rename)(const struct path *old_dir, struct dentry *old_dentry,
+                                const struct path *new_dir,
                                 struct dentry *new_dentry);
-        int (*path_chmod)(struct path *path, umode_t mode);
-        int (*path_chown)(struct path *path, kuid_t uid, kgid_t gid);
-        int (*path_chroot)(struct path *path);
+        int (*path_chmod)(const struct path *path, umode_t mode);
+        int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid);
+        int (*path_chroot)(const struct path *path);
 #endif
 
         int (*inode_alloc_security)(struct inode *inode);