switch is_sxid() to umode_t

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

diff --git a/fs/attr.c b/fs/attr.c
index 7ee7ba48831358f7bf4f738a13c20511dcdd1698..95053ad8abccf4de6cd6355577a19bd2ff70ec8f 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(setattr_copy);
 int notify_change(struct dentry * dentry, struct iattr * attr)
 {
        struct inode *inode = dentry->d_inode;
-       mode_t mode = inode->i_mode;
+       umode_t mode = inode->i_mode;
        int error;
        struct timespec now;
        unsigned int ia_valid = attr->ia_valid;
@@ -177,7 +177,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr)
        }
 
        if ((ia_valid & ATTR_MODE)) {
-               mode_t amode = attr->ia_mode;
+               umode_t amode = attr->ia_mode;
                /* Flag setting protected by i_mutex */
                if (is_sxid(amode))
                        inode->i_flags &= ~S_NOSEC;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9db9f6e6c98b4fe8e74ba7d9161ceaae36169d0b..9d02fab420c62e159cfb6dcf07556132ad5dcf63 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2690,7 +2690,7 @@ int __init get_filesystem_list(char *buf);
 #define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \
                                            (flag & __FMODE_NONOTIFY)))
 
-static inline int is_sxid(mode_t mode)
+static inline int is_sxid(umode_t mode)
 {
        return (mode & S_ISUID) || ((mode & S_ISGID) && (mode & S_IXGRP));
 }