summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-26 04:25:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:55:13 -0500
commit910f4ecef3f67714ebff69d0bc34313e48afaed2 (patch)
tree348fe3b5d8789a4c019a700da5501a4756f988de
parent49f0a0767211d3076974e59a26f36b567cbe8621 (diff)
downloadlinux-910f4ecef3f67714ebff69d0bc34313e48afaed2.tar.bz2
switch security_path_chmod() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/security.h6
-rw-r--r--security/apparmor/lsm.c2
-rw-r--r--security/capability.c2
-rw-r--r--security/security.c2
-rw-r--r--security/tomoyo/tomoyo.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 0e5aeb86dfc4..f2c1fd7978a5 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1436,7 +1436,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
@@ -2867,7 +2867,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 */
@@ -2921,7 +2921,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 37832026e58a..afbe49822bed 100644
--- 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 9def035cd572..4f24bee49f26 100644
--- 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 8cc0f0caa640..3635a13cd4ab 100644
--- a/security/security.c
+++ b/security/security.c
@@ -455,7 +455,7 @@ int security_path_truncate(struct path *path)
}
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 4b327b691745..a4b840ea0078 100644
--- 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,