From: Adrian Bunk Date: Thu, 7 Feb 2008 08:13:43 +0000 (-0800) Subject: kernel/cgroup.c: remove dead code X-Git-Tag: v2.6.25-rc1~485 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3cdeed2986b09fcc77b4812ca10dbc057e4e5f8c;p=linux-2.6-omap-h63xx.git kernel/cgroup.c: remove dead code This patch removes dead code spotted by the Coverity checker (look at the "(nbytes >= PATH_MAX)" check). Signed-off-by: Adrian Bunk Cc: Paul Jackson Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 1a3c23936d4..ae367471b07 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1355,16 +1355,14 @@ static ssize_t cgroup_common_file_write(struct cgroup *cgrp, if (nbytes && (buffer[nbytes-1] == '\n')) { buffer[nbytes-1] = 0; } - if (nbytes < sizeof(root->release_agent_path)) { - /* We never write anything other than '\0' - * into the last char of release_agent_path, - * so it always remains a NUL-terminated - * string */ - strncpy(root->release_agent_path, buffer, nbytes); - root->release_agent_path[nbytes] = 0; - } else { - retval = -ENOSPC; - } + + /* We never write anything other than '\0' + * into the last char of release_agent_path, + * so it always remains a NUL-terminated + * string */ + strncpy(root->release_agent_path, buffer, nbytes); + root->release_agent_path[nbytes] = 0; + break; } default: