switch security_path_chmod() to umode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit 910f4ecef3f67714ebff69d0bc34313e48afaed2)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index baf4f92..b91e9ac 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1441,7 +1441,7 @@ struct security_operations {
        int (*path_rename) (struct path *old_dir, struct dentry *old_dentry,
                            struct path *new_dir, struct dentry *new_dentry);
        int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt,
-                          mode_t mode);
+                          umode_t mode);
        int (*path_chown) (struct path *path, uid_t uid, gid_t gid);
        int (*path_chroot) (struct path *path);
 #endif
@@ -2877,7 +2877,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                         struct path *new_dir, struct dentry *new_dentry);
 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                       mode_t mode);
+                       umode_t mode);
 int security_path_chown(struct path *path, uid_t uid, gid_t gid);
 int security_path_chroot(struct path *path);
 #else  /* CONFIG_SECURITY_PATH */
@@ -2931,7 +2931,7 @@ static inline int security_path_rename(struct path *old_dir,
 
 static inline int security_path_chmod(struct dentry *dentry,
                                      struct vfsmount *mnt,
-                                     mode_t mode)
+                                     umode_t mode)
 {
        return 0;
 }

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 41ae0c6..ba9e3f6 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -345,7 +345,7 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
 }
 
 static int apparmor_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                              mode_t mode)
+                              umode_t mode)
 {
        if (!mediated_filesystem(dentry->d_inode))
                return 0;

diff --git a/security/capability.c b/security/capability.c
index 26d5ef8..ceb5391 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -280,7 +280,7 @@ static int cap_path_truncate(struct path *path)
 }
 
 static int cap_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                         mode_t mode)
+                         umode_t mode)
 {
        return 0;
 }

diff --git a/security/security.c b/security/security.c
index 97d0d94..1f95a3a 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -467,7 +467,7 @@ int security_path_truncate(struct path *path)
 EXPORT_SYMBOL(security_path_truncate);
 
 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                       mode_t mode)
+                       umode_t mode)
 {
        if (unlikely(IS_PRIVATE(dentry->d_inode)))
                return 0;

diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 4b327b6..a4b840e 100644 (file)
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -360,7 +360,7 @@ static int tomoyo_file_ioctl(struct file *file, unsigned int cmd,
  * Returns 0 on success, negative value otherwise.
  */
 static int tomoyo_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                            mode_t mode)
+                            umode_t mode)
 {
        struct path path = { mnt, dentry };
        return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path,