proc-save-decrement-during-lookup-readdir-in-proc-pid.patch removed from -mm tree

merged [email protected] 1 participant 1 message Dec 14, 2016

Share & tools

[email protected]

author tree notice Applied

2016-12-14 19:27 UTC #0 lore raw

The patch titled
Subject: fs/proc/base.c: save decrement during lookup/readdir in /proc/$PID
has been removed from the -mm tree. Its filename was
proc-save-decrement-during-lookup-readdir-in-proc-pid.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: 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@avx2 open here

Signed-off-by Alexey Dobriyan <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 fs/proc/base.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

fs/proc/base.c renamed from fs/proc/base.c~proc-save-decrement-during-lookup-readdir-in-proc-pid +4 -4

diff -puN fs/proc/base.c~proc-save-decrement-during-lookup-readdir-in-proc-pid fs/proc/base.c
@@ -2412,14 +2412,14 @@ static struct dentry *proc_pident_lookup
 	 * Yes, it does not scale. And it should not. Don't add
 	 * new entries into /proc/<tgid>/ without very good reasons.
 	 */
-	last = &ents[nents - 1];
-	for (p = ents; p <= last; p++) {
+	last = &ents[nents];
+	for (p = ents; p < last; p++) {
 		if (p->len != dentry->d_name.len)
 			continue;
 		if (!memcmp(dentry->d_name.name, p->name, p->len))
 			break;
 	}
-	if (p > last)
+	if (p >= last)
 		goto out;
 
 	error = proc_pident_instantiate(dir, dentry, task, p);

@@ -2444,7 +2444,7 @@ static int proc_pident_readdir(struct fi
 	if (ctx->pos >= nents + 2)
 		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,
 				proc_pident_instantiate, task, p))
 			break;

Patches currently in -mm which might be from [email protected] are

kbuild-simpler-generation-of-assembly-constants.patch coredump-clarify-unsafe-core_pattern-warning.patch