Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / fs / attr.c

diff --git a/fs/attr.c b/fs/attr.c
index 7ee7ba4..95053ad 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;