aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-07-30 09:02:04 +1000
committerJames Morris <jmorris@namei.org>2010-08-02 15:38:37 +1000
commit4d6ec10bb4461fdc9a9ab94ef32934e13564e873 (patch)
treeb252da668c7485b864dd012b33f58d7c108d99a1 /security
parentc88d4c7b049e87998ac0a9f455aa545cc895ef92 (diff)
downloadkernel_samsung_smdk4412-4d6ec10bb4461fdc9a9ab94ef32934e13564e873.zip
kernel_samsung_smdk4412-4d6ec10bb4461fdc9a9ab94ef32934e13564e873.tar.gz
kernel_samsung_smdk4412-4d6ec10bb4461fdc9a9ab94ef32934e13564e873.tar.bz2
AppArmor: update path_truncate method to latest version
Remove extraneous path_truncate arguments from the AppArmor hook, as they've been removed from the LSM API. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/lsm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 7daf0d5..8db33a8 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -278,8 +278,7 @@ static int apparmor_path_mknod(struct path *dir, struct dentry *dentry,
return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode);
}
-static int apparmor_path_truncate(struct path *path, loff_t length,
- unsigned int time_attrs)
+static int apparmor_path_truncate(struct path *path)
{
struct path_cond cond = { path->dentry->d_inode->i_uid,
path->dentry->d_inode->i_mode