diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-10-18 23:28:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:38 -0400 |
commit | c012a54ae0b2ee2c73499f54596e0f5257288fec (patch) | |
tree | 4fab77415948c241c563a4de1e8e29fcc0604828 /security | |
parent | 2cdc7241a290bb2b9ef4c2e2969a4a3ed92abb63 (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>
Diffstat (limited to 'security')
-rw-r--r-- | security/device_cgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 9c625f65ee56..d5c15a7c67c3 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
@@ -355,7 +355,7 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, | |||
355 | struct dev_cgroup *cur_devcgroup; | 355 | struct dev_cgroup *cur_devcgroup; |
356 | const char *b; | 356 | const char *b; |
357 | char *endp; | 357 | char *endp; |
358 | int retval = 0, count; | 358 | int count; |
359 | struct dev_whitelist_item wh; | 359 | struct dev_whitelist_item wh; |
360 | 360 | ||
361 | if (!capable(CAP_SYS_ADMIN)) | 361 | if (!capable(CAP_SYS_ADMIN)) |
@@ -432,7 +432,6 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, | |||
432 | } | 432 | } |
433 | 433 | ||
434 | handle: | 434 | handle: |
435 | retval = 0; | ||
436 | switch (filetype) { | 435 | switch (filetype) { |
437 | case DEVCG_ALLOW: | 436 | case DEVCG_ALLOW: |
438 | if (!parent_has_perm(devcgroup, &wh)) | 437 | if (!parent_has_perm(devcgroup, &wh)) |