Commit 36885d7b authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Eric W. Biederman

sysctl: remove impossible condition check

Remove checks for conditions that will never happen. If procname is NULL
the loop would already had bailed out, so there's no need to check it
again.

At the same time this also compacts the function find_in_table() by
refactoring it to be easier to read.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
Reviewed-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent dcd6c922
......@@ -59,17 +59,11 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
static struct ctl_table *find_in_table(struct ctl_table *p, struct qstr *name)
{
int len;
for ( ; p->procname; p++) {
if (!p->procname)
continue;
len = strlen(p->procname);
if (len != name->len)
if (strlen(p->procname) != name->len)
continue;
if (memcmp(p->procname, name->name, len) != 0)
if (memcmp(p->procname, name->name, name->len) != 0)
continue;
/* I have a match */
......@@ -266,10 +260,6 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
for (; table->procname; table++, (*pos)++) {
int res;
/* Can't do anything without a proc name */
if (!table->procname)
continue;
if (*pos < file->f_pos)
continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment