diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-24 23:21:59 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:11 -0500 |
| commit | 8d334acdd2c1f57c7a574c6f24d08e4c95582ff0 (patch) | |
| tree | 195e9c55d2310fa81e7bd325a95481b33b9a2d4a | |
| parent | 62bb109170375f82eb3c51c8080b72954f02dca7 (diff) | |
| download | linux-stable-8d334acdd2c1f57c7a574c6f24d08e4c95582ff0.tar.gz linux-stable-8d334acdd2c1f57c7a574c6f24d08e4c95582ff0.tar.bz2 linux-stable-8d334acdd2c1f57c7a574c6f24d08e4c95582ff0.zip | |
switch is_sxid() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/attr.c | 4 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/attr.c b/fs/attr.c index 7ee7ba488313..95053ad8abcc 100644 --- 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 9db9f6e6c98b..9d02fab420c6 100644 --- 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)); } |