[RHEL7,COMMIT] ms/kernel/kcmp.c: drop branch leftover typo

Submitted by Konstantin Khorenko on Oct. 11, 2017, 2:05 p.m.


Message ID 201710111405.v9BE5p5K000796@finist_ce7.work
State New
Series "ms/kernel/kcmp.c: drop branch leftover typo"
Headers show

Commit Message

Konstantin Khorenko Oct. 11, 2017, 2:05 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.vz7.37.11
commit 885614084b57b8e6c51789c5280fffbf14287443
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Tue Oct 3 16:16:26 2017 -0700

    ms/kernel/kcmp.c: drop branch leftover typo
    The else branch been left over and escaped the source code refresh.
    Not a problem but better clean it up.
    Fixes: 0791e3644e5e ("kcmp: add KCMP_EPOLL_TFD mode to compare epoll target files")
    Link: http://lkml.kernel.org/r/20170917165838.GA1887@uranus.lan
    Reported-by: Eugene Syromiatnikov <esyr@redhat.com>
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: Andrei Vagin <avagin@virtuozzo.com>
    Cc: Pavel Emelyanov <xemul@virtuozzo.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    (cherry picked from commit c9653850c90d6050197bc76ba672e00a7771aea5)
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
 kernel/kcmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/kernel/kcmp.c b/kernel/kcmp.c
index b8ecf9d..8319472 100644
--- a/kernel/kcmp.c
+++ b/kernel/kcmp.c
@@ -131,7 +131,7 @@  static int kcmp_epoll_target(struct task_struct *task1,
 	if (filp_epoll) {
 		filp_tgt = get_epoll_tfile_raw_ptr(filp_epoll, slot.tfd, slot.toff);
-	} else
+	}
 	if (IS_ERR(filp_tgt))
 		return PTR_ERR(filp_tgt);