summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-10-18 20:28:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 08:52:38 -0700
commitc012a54ae0b2ee2c73499f54596e0f5257288fec (patch)
tree4fab77415948c241c563a4de1e8e29fcc0604828
parent2cdc7241a290bb2b9ef4c2e2969a4a3ed92abb63 (diff)
devcgroup: remove unused variable
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/device_cgroup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 9c625f65ee5..d5c15a7c67c 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -355,7 +355,7 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
struct dev_cgroup *cur_devcgroup;
const char *b;
char *endp;
- int retval = 0, count;
+ int count;
struct dev_whitelist_item wh;
if (!capable(CAP_SYS_ADMIN))
@@ -432,7 +432,6 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
}
handle:
- retval = 0;
switch (filetype) {
case DEVCG_ALLOW:
if (!parent_has_perm(devcgroup, &wh))