lkml.org 
[lkml]   [2019]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 009/104] cifs: use correct format characters
    Date
    [ Upstream commit 259594bea574e515a148171b5cd84ce5cbdc028a ]

    When compiling with -Wformat, clang emits the following warnings:

    fs/cifs/smb1ops.c:312:20: warning: format specifies type 'unsigned
    short' but the argument has type 'unsigned int' [-Wformat]
    tgt_total_cnt, total_in_tgt);
    ^~~~~~~~~~~~

    fs/cifs/cifs_dfs_ref.c:289:4: warning: format specifies type 'short'
    but the argument has type 'int' [-Wformat]
    ref->flags, ref->server_type);
    ^~~~~~~~~~

    fs/cifs/cifs_dfs_ref.c:289:16: warning: format specifies type 'short'
    but the argument has type 'int' [-Wformat]
    ref->flags, ref->server_type);
    ^~~~~~~~~~~~~~~~

    fs/cifs/cifs_dfs_ref.c:291:4: warning: format specifies type 'short'
    but the argument has type 'int' [-Wformat]
    ref->ref_flag, ref->path_consumed);
    ^~~~~~~~~~~~~

    fs/cifs/cifs_dfs_ref.c:291:19: warning: format specifies type 'short'
    but the argument has type 'int' [-Wformat]
    ref->ref_flag, ref->path_consumed);
    ^~~~~~~~~~~~~~~~~~
    The types of these arguments are unconditionally defined, so this patch
    updates the format character to the correct ones for ints and unsigned
    ints.

    Link: https://github.com/ClangBuiltLinux/linux/issues/378

    Signed-off-by: Louis Taylor <louis@kragniz.eu>
    Signed-off-by: Steve French <stfrench@microsoft.com>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/cifs/cifs_dfs_ref.c | 4 ++--
    fs/cifs/smb1ops.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
    index b8602f199815..71263ea90810 100644
    --- a/fs/cifs/cifs_dfs_ref.c
    +++ b/fs/cifs/cifs_dfs_ref.c
    @@ -265,9 +265,9 @@ static void dump_referral(const struct dfs_info3_param *ref)
    {
    cifs_dbg(FYI, "DFS: ref path: %s\n", ref->path_name);
    cifs_dbg(FYI, "DFS: node path: %s\n", ref->node_name);
    - cifs_dbg(FYI, "DFS: fl: %hd, srv_type: %hd\n",
    + cifs_dbg(FYI, "DFS: fl: %d, srv_type: %d\n",
    ref->flags, ref->server_type);
    - cifs_dbg(FYI, "DFS: ref_flags: %hd, path_consumed: %hd\n",
    + cifs_dbg(FYI, "DFS: ref_flags: %d, path_consumed: %d\n",
    ref->ref_flag, ref->path_consumed);
    }

    diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
    index b0f973b2b189..2a43aa6d8e87 100644
    --- a/fs/cifs/smb1ops.c
    +++ b/fs/cifs/smb1ops.c
    @@ -305,7 +305,7 @@ coalesce_t2(char *second_buf, struct smb_hdr *target_hdr)
    remaining = tgt_total_cnt - total_in_tgt;

    if (remaining < 0) {
    - cifs_dbg(FYI, "Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%hu\n",
    + cifs_dbg(FYI, "Server sent too much data. tgt_total_cnt=%hu total_in_tgt=%u\n",
    tgt_total_cnt, total_in_tgt);
    return -EPROTO;
    }
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-24 20:14    [W:4.124 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site