aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2011-12-08 09:51:53 -0600
committerAl Viro2012-01-06 22:16:53 -0600
commitcdcf116d44e78c7216ba9f8be9af1cdfca7af728 (patch)
tree2417cfd3e06ac5e2468585e8f00d580242cb5571 /security/apparmor
parentd8c9584ea2a92879f471fd3a2be3af6c534fb035 (diff)
downloadam43-linux-kernel-cdcf116d44e78c7216ba9f8be9af1cdfca7af728.tar.gz
am43-linux-kernel-cdcf116d44e78c7216ba9f8be9af1cdfca7af728.tar.xz
am43-linux-kernel-cdcf116d44e78c7216ba9f8be9af1cdfca7af728.zip
switch security_path_chmod() to struct path *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/lsm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index c0a399ec1df..2c0a0ff4139 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -344,13 +344,12 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
344 return error; 344 return error;
345} 345}
346 346
347static int apparmor_path_chmod(struct dentry *dentry, struct vfsmount *mnt, 347static int apparmor_path_chmod(struct path *path, umode_t mode)
348 umode_t mode)
349{ 348{
350 if (!mediated_filesystem(dentry->d_inode)) 349 if (!mediated_filesystem(path->dentry->d_inode))
351 return 0; 350 return 0;
352 351
353 return common_perm_mnt_dentry(OP_CHMOD, mnt, dentry, AA_MAY_CHMOD); 352 return common_perm_mnt_dentry(OP_CHMOD, path->mnt, path->dentry, AA_MAY_CHMOD);
354} 353}
355 354
356static int apparmor_path_chown(struct path *path, uid_t uid, gid_t gid) 355static int apparmor_path_chown(struct path *path, uid_t uid, gid_t gid)