Commit 259594be authored Feb 27, 2019 by Louis Taylor Committed by Steve French Mar 05, 2019

cifs: use correct format characters

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>

parent d42043a6

fs/cifs/cifs_dfs_ref.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

fs/cifs/smb1ops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message