Merge branch 'devel-stable' into devel

[sfrench/cifs-2.6.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index 351942a4ca0e79b0c21ccd35c31e442928792f47..e8c87b8601b4560bda565064212b79d0004d46ed 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -417,12 +417,11 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                                         new_dentry);
 }
 
-int security_path_truncate(struct path *path, loff_t length,
-                          unsigned int time_attrs)
+int security_path_truncate(struct path *path)
 {
        if (unlikely(IS_PRIVATE(path->dentry->d_inode)))
                return 0;
-       return security_ops->path_truncate(path, length, time_attrs);
+       return security_ops->path_truncate(path);
 }
 
 int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,