kernel/fork.c: unused variable 'ret'

[sfrench/cifs-2.6.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index 36b4b4daebec0a465fb8490c9531ed71d694ae59..688926e496be18737d8ae37af9fe807f75185f56 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -280,9 +280,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
        if (ret < 0)
                goto error;
 
-       ret = audit_log_capset(pid, new, current_cred());
-       if (ret < 0)
-               return ret;
+       audit_log_capset(pid, new, current_cred());
 
        return commit_creds(new);
 
@@ -308,7 +306,7 @@ int capable(int cap)
                BUG();
        }
 
-       if (has_capability(current, cap)) {
+       if (security_capable(cap) == 0) {
                current->flags |= PF_SUPERPRIV;
                return 1;
        }