switch ->path_mknod() to umode_t

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

diff --git a/include/linux/security.h b/include/linux/security.h
index 2bbffdf..9eaa3cf 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1431,7 +1431,7 @@ struct security_operations {
        int (*path_unlink) (struct path *dir, struct dentry *dentry);
        int (*path_mkdir) (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 mode,
+       int (*path_mknod) (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,
@@ -2867,7 +2867,7 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi
 int security_path_unlink(struct path *dir, struct dentry *dentry);
 int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode);
 int security_path_rmdir(struct path *dir, struct dentry *dentry);
-int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,
+int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
                        unsigned int dev);
 int security_path_truncate(struct path *path);
 int security_path_symlink(struct path *dir, struct dentry *dentry,
@@ -2898,7 +2898,7 @@ static inline int security_path_rmdir(struct path *dir, struct dentry *dentry)
 }
 
 static inline int security_path_mknod(struct path *dir, struct dentry *dentry,
-                                     int mode, unsigned int dev)
+                                     umode_t mode, unsigned int dev)
 {
        return 0;
 }

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index d99678a..624cd6b 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -847,7 +847,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        atomic_set(&addr->refcnt, 1);
 
        if (sun_path[0]) {
-               unsigned int mode;
+               umode_t mode;
                err = 0;
                /*
                 * Get the parent directory, calculate the hash for last

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index f16d47e..14b413f 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -274,7 +274,7 @@ static int apparmor_path_rmdir(struct path *dir, struct dentry *dentry)
 }
 
 static int apparmor_path_mknod(struct path *dir, struct dentry *dentry,
-                              int mode, unsigned int dev)
+                              umode_t mode, unsigned int dev)
 {
        return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode);
 }

diff --git a/security/capability.c b/security/capability.c
index 7791cad..8143e91 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -235,7 +235,7 @@ static void cap_inode_getsecid(const struct inode *inode, u32 *secid)
 }
 
 #ifdef CONFIG_SECURITY_PATH
-static int cap_path_mknod(struct path *dir, struct dentry *dentry, int mode,
+static int cap_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
                          unsigned int dev)
 {
        return 0;

diff --git a/security/security.c b/security/security.c
index c95e970..7aaaeee 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -392,7 +392,7 @@ int security_old_inode_init_security(struct inode *inode, struct inode *dir,
 EXPORT_SYMBOL(security_old_inode_init_security);
 
 #ifdef CONFIG_SECURITY_PATH
-int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,
+int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
                        unsigned int dev)
 {
        if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 95e4a7d..75c956a 100644 (file)
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -234,7 +234,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
  * Returns 0 on success, negative value otherwise.
  */
 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
-                            int mode, unsigned int dev)
+                            umode_t mode, unsigned int dev)
 {
        struct path path = { parent->mnt, dentry };
        int type = TOMOYO_TYPE_CREATE;