lkml.org 
[lkml]   [2019]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v2] cifs: use correct format characters
On Wed, Feb 27, 2019 at 2:26 PM Louis Taylor <louis@kragniz.eu> wrote:
>
> 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>

Thanks for following up on the feedback.
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

> ---
> 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 d9b99abe1243..5d83c924cc47 100644
> --- a/fs/cifs/cifs_dfs_ref.c
> +++ b/fs/cifs/cifs_dfs_ref.c
> @@ -285,9 +285,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 32a6c020478f..20a88776f04d 100644
> --- a/fs/cifs/smb1ops.c
> +++ b/fs/cifs/smb1ops.c
> @@ -308,7 +308,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.20.1
>


--
Thanks,
~Nick Desaulniers

\
 
 \ /
  Last update: 2019-02-28 00:14    [W:0.079 / U:15.968 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site