Commit bac5f5d5 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

fs/proc/base.c: save decrement during lookup/readdir in /proc/$PID

Comparison for "<" works equally well as comparison for "<=" but one
SUB/LEA is saved (no, it is not optimised away, at least here).

Link: http://lkml.kernel.org/r/20161122195143.GA29812@avx2Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 209b14dc
...@@ -2412,14 +2412,14 @@ static struct dentry *proc_pident_lookup(struct inode *dir, ...@@ -2412,14 +2412,14 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
* Yes, it does not scale. And it should not. Don't add * Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons. * new entries into /proc/<tgid>/ without very good reasons.
*/ */
last = &ents[nents - 1]; last = &ents[nents];
for (p = ents; p <= last; p++) { for (p = ents; p < last; p++) {
if (p->len != dentry->d_name.len) if (p->len != dentry->d_name.len)
continue; continue;
if (!memcmp(dentry->d_name.name, p->name, p->len)) if (!memcmp(dentry->d_name.name, p->name, p->len))
break; break;
} }
if (p > last) if (p >= last)
goto out; goto out;
error = proc_pident_instantiate(dir, dentry, task, p); error = proc_pident_instantiate(dir, dentry, task, p);
...@@ -2444,7 +2444,7 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx, ...@@ -2444,7 +2444,7 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
if (ctx->pos >= nents + 2) if (ctx->pos >= nents + 2)
goto out; goto out;
for (p = ents + (ctx->pos - 2); p <= ents + nents - 1; p++) { for (p = ents + (ctx->pos - 2); p < ents + nents; p++) {
if (!proc_fill_cache(file, ctx, p->name, p->len, if (!proc_fill_cache(file, ctx, p->name, p->len,
proc_pident_instantiate, task, p)) proc_pident_instantiate, task, p))
break; break;
......
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