diff options
| author | James Morris <jmorris@namei.org> | 2010-07-29 19:02:04 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-08-02 01:38:37 -0400 |
| commit | 4d6ec10bb4461fdc9a9ab94ef32934e13564e873 (patch) | |
| tree | b252da668c7485b864dd012b33f58d7c108d99a1 /security/apparmor | |
| parent | c88d4c7b049e87998ac0a9f455aa545cc895ef92 (diff) | |
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/apparmor')
| -rw-r--r-- | security/apparmor/lsm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 7daf0d52803..8db33a8b50c 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, | |||
| 278 | return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode); | 278 | return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode); |
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | static int apparmor_path_truncate(struct path *path, loff_t length, | 281 | static int apparmor_path_truncate(struct path *path) |
| 282 | unsigned int time_attrs) | ||
| 283 | { | 282 | { |
| 284 | struct path_cond cond = { path->dentry->d_inode->i_uid, | 283 | struct path_cond cond = { path->dentry->d_inode->i_uid, |
| 285 | path->dentry->d_inode->i_mode | 284 | path->dentry->d_inode->i_mode |