lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 201/250] ring-buffer: Fix return value check in test_ringbuffer()
    Date
    From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

    commit 62277de758b155dc04b78f195a1cb5208c37b2df upstream.

    In case of error, the function kthread_run() returns ERR_PTR()
    and never returns NULL. The NULL test in the return value check
    should be replaced with IS_ERR().

    Link: http://lkml.kernel.org/r/1466184839-14927-1-git-send-email-weiyj_lk@163.com

    Fixes: 6c43e554a ("ring-buffer: Add ring buffer startup selftest")
    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    kernel/trace/ring_buffer.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
    index c4ce3a9..2948be9 100644
    --- a/kernel/trace/ring_buffer.c
    +++ b/kernel/trace/ring_buffer.c
    @@ -4837,9 +4837,9 @@ static __init int test_ringbuffer(void)
    rb_data[cpu].cnt = cpu;
    rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu],
    "rbtester/%d", cpu);
    - if (WARN_ON(!rb_threads[cpu])) {
    + if (WARN_ON(IS_ERR(rb_threads[cpu]))) {
    pr_cont("FAILED\n");
    - ret = -1;
    + ret = PTR_ERR(rb_threads[cpu]);
    goto out_free;
    }

    @@ -4849,9 +4849,9 @@ static __init int test_ringbuffer(void)

    /* Now create the rb hammer! */
    rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer");
    - if (WARN_ON(!rb_hammer)) {
    + if (WARN_ON(IS_ERR(rb_hammer))) {
    pr_cont("FAILED\n");
    - ret = -1;
    + ret = PTR_ERR(rb_hammer);
    goto out_free;
    }

    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-06-12 01:16    [W:2.817 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site