lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 507/542] lib/scatterlist.c: adjust indentation in __sg_alloc_table
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 4e456fee215677584cafa7f67298a76917e89c64 ]

    Clang warns:

    ../lib/scatterlist.c:314:5: warning: misleading indentation; statement
    is not part of the previous 'if' [-Wmisleading-indentation]
    return -ENOMEM;
    ^
    ../lib/scatterlist.c:311:4: note: previous statement is here
    if (prv)
    ^
    1 warning generated.

    This warning occurs because there is a space before the tab on this
    line. Remove it so that the indentation is consistent with the Linux
    kernel coding style and clang no longer warns.

    Link: http://lkml.kernel.org/r/20191218033606.11942-1-natechancellor@gmail.com
    Link: https://github.com/ClangBuiltLinux/linux/issues/830
    Fixes: edce6820a9fd ("scatterlist: prevent invalid free when alloc fails")
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    lib/scatterlist.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/lib/scatterlist.c b/lib/scatterlist.c
    index c2cf2c311b7db..5813072bc5895 100644
    --- a/lib/scatterlist.c
    +++ b/lib/scatterlist.c
    @@ -311,7 +311,7 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
    if (prv)
    table->nents = ++table->orig_nents;

    - return -ENOMEM;
    + return -ENOMEM;
    }

    sg_init_table(sg, alloc_size);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:49    [W:3.514 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site