diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /security/commoncap.c | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 97ac1f167717..48b7e0228fa3 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -948,7 +948,6 @@ changed: | |||
| 948 | return commit_creds(new); | 948 | return commit_creds(new); |
| 949 | 949 | ||
| 950 | no_change: | 950 | no_change: |
| 951 | error = 0; | ||
| 952 | error: | 951 | error: |
| 953 | abort_creds(new); | 952 | abort_creds(new); |
| 954 | return error; | 953 | return error; |