---

yaml --- r: 280269 b: refs/heads/master c: 910f4ec h: refs/heads/master i: 280267: 0d04a5c v: v3
git-mirror · Jan 4, 2012 · 864681a · 864681a
1 parent 2c02186
commit 864681a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49f0a0767211d3076974e59a26f36b567cbe8621
+refs/heads/master: 910f4ecef3f67714ebff69d0bc34313e48afaed2
diff --git a/trunk/include/linux/security.h b/trunk/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/trunk/security/apparmor/lsm.c b/trunk/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/trunk/security/capability.c b/trunk/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/trunk/security/security.c b/trunk/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/trunk/security/tomoyo/tomoyo.c b/trunk/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,