Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[~andy/linux] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 156816d451ba67ab5f82f39e01744cdbb691afc8..2f680eb02b59e3f08a437f97d963eac100b3b3ea 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -279,8 +279,7 @@ static int cap_path_truncate(struct path *path)
        return 0;
 }
 
-static int cap_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                         umode_t mode)
+static int cap_path_chmod(struct path *path, umode_t mode)
 {
        return 0;
 }
@@ -999,7 +998,6 @@ void __init security_fixup_ops(struct security_operations *ops)
        set_to_cap_if_null(ops, sem_semctl);
        set_to_cap_if_null(ops, sem_semop);
        set_to_cap_if_null(ops, netlink_send);
-       set_to_cap_if_null(ops, netlink_recv);
        set_to_cap_if_null(ops, d_instantiate);
        set_to_cap_if_null(ops, getprocattr);
        set_to_cap_if_null(ops, setprocattr);