mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* + fix-code-style-warning.patch added to -mm tree
@ 2017-11-14  0:24 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2017-11-14  0:24 UTC (permalink / raw)
  To: mail, keescook, mm-commits


The patch titled
     Subject: kernel/sysctl.c: code cleanups
has been added to the -mm tree.  Its filename is
     fix-code-style-warning.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/fix-code-style-warning.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/fix-code-style-warning.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: "Ola N. Kaldestad" <mail@okal.no>
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@okal.no
Signed-off-by: Ola N. Kaldestad <mail@okal.no>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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
@@ -3125,14 +3125,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@okal.no are

fix-code-style-warning.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-11-14  0:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-14  0:24 + fix-code-style-warning.patch added to -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).