The patch titled
Subject: kernel/sysctl.c: code cleanups
has been removed from the -mm tree. Its filename was
fix-code-style-warning.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Ola N. Kaldestad" <mail@xxxxxxx>
Subject: kernel/sysctl.c: code cleanups
Remove unnecessary else block, remove redundant return and call to kfree
in if block.
Link: http://lkml.kernel.org/r/1510238435-1655-1-git-send-email-mail@xxxxxxx
Signed-off-by: Ola N. Kaldestad <mail@xxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/sysctl.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff -puN kernel/sysctl.c~fix-code-style-warning kernel/sysctl.c
--- a/kernel/sysctl.c~fix-code-style-warning
+++ a/kernel/sysctl.c
@@ -3127,14 +3127,12 @@ int proc_do_large_bitmap(struct ctl_tabl
else
bitmap_copy(bitmap, tmp_bitmap, bitmap_len);
}
- kfree(tmp_bitmap);
*lenp -= left;
*ppos += *lenp;
- return 0;
- } else {
- kfree(tmp_bitmap);
- return err;
}
+
+ kfree(tmp_bitmap);
+ return err;
}
#else /* CONFIG_PROC_SYSCTL */
_
Patches currently in -mm which might be from mail@xxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
