Subject: [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

From: Geert Uytterhoeven <[email-masked]>
Date: Fri, 4 Jun 2021 11:02:19 +0200

On 32-bit (e.g. m68k):

    fs/cifs/cifssmb.c: In function ‘cifs_reconnect_tcon’:
    ./include/linux/kern_levels.h:5:18: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=]
    fs/cifs/cifssmb.c:201:42: note: format string is defined here
      201 |  cifs_dbg(FYI, "sess reconnect mask: 0x%lx, tcon reconnect: %d",
	  |                                        ~~^
	  |                                          |
	  |                                          long unsigned int
	  |                                        %x

    fs/cifs/transport.c: In function ‘cifs_pick_channel’:
    fs/cifs/cifsglob.h:955:20: error: passing argument 2 of ‘test_bit’ from incompatible pointer type [-Werror=incompatible-pointer-types]
      955 |  test_bit((index), &(ses)->chans_need_reconnect)
	  |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
	  |                    |
	  |                    size_t * {aka unsigned int *}
    ./arch/m68k/include/asm/bitops.h:151:66: note: expected ‘const volatile long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
      151 | static inline int test_bit(int nr, const volatile unsigned long *vaddr)
	  |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~

    fs/cifs/sess.c: In function ‘cifs_chan_set_need_reconnect’:
    fs/cifs/sess.c:98:22: error: passing argument 2 of ‘bset_mem_set_bit’ from incompatible pointer type [-Werror=incompatible-pointer-types]
       98 |  set_bit(chan_index, &ses->chans_need_reconnect);
	  |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
	  |                      |
	  |                      size_t * {aka unsigned int *}
    ./arch/m68k/include/asm/bitops.h:41:69: note: expected ‘volatile long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
       41 | static inline void bset_mem_set_bit(int nr, volatile unsigned long *vaddr)
	  |                                             ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
    fs/cifs/sess.c:98:22: error: passing argument 2 of ‘bfset_mem_set_bit’ from incompatible pointer type [-Werror=incompatible-pointer-types]
       98 |  set_bit(chan_index, &ses->chans_need_reconnect);
	  |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
	  |                      |
	  |                      size_t * {aka unsigned int *}
    ./arch/m68k/include/asm/bitops.h:50:70: note: expected ‘volatile long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
       50 | static inline void bfset_mem_set_bit(int nr, volatile unsigned long *vaddr)
	  |                                              ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~

   [...]

As bitops can only operate on long objects, and
cifs_ses_get_chan_index() already returns "unsigned long", fix this by
changing cifs_ses.chans_need_reconnect and chan_index from "size_t" to
"unsigned long".

Fixes: 374c6c7bba3cbaa1 ("cifs: changes to support multichannel during channel reconnect")
Reported-by: [email-masked]
Signed-off-by: Geert Uytterhoeven <[email-masked]>
---
Can you please add Link: headers when committing patches?
I could not find this patch in the lore archives of linux-cifs or
linux-fsdevel, presumably it was posted elsewhere?
Thanks!
---
 fs/cifs/cifsglob.h | 2 +-
 fs/cifs/sess.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 8fea2ddd2bd7af26..a9c026af21e1e9d1 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -968,7 +968,7 @@ struct cifs_ses {
 	 * enable the sessions on top to continue to live till any
 	 * of the channels below are active.
 	 */
-	size_t chans_need_reconnect;
+	unsigned long chans_need_reconnect;
 };
 
 static inline bool
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 1721a3b246942266..1a17ddd6abbe5778 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -94,7 +94,7 @@ void
 cifs_chan_set_need_reconnect(struct cifs_ses *ses,
 			     struct TCP_Server_Info *server)
 {
-	size_t chan_index = cifs_ses_get_chan_index(ses, server);
+	unsigned long chan_index = cifs_ses_get_chan_index(ses, server);
 	set_bit(chan_index, &ses->chans_need_reconnect);
 	cifs_dbg(FYI, "Set reconnect bitmask for chan %lu; now 0x%lx\n",
 		 chan_index, ses->chans_need_reconnect);
@@ -104,7 +104,7 @@ void
 cifs_chan_clear_need_reconnect(struct cifs_ses *ses,
 			       struct TCP_Server_Info *server)
 {
-	size_t chan_index = cifs_ses_get_chan_index(ses, server);
+	unsigned long chan_index = cifs_ses_get_chan_index(ses, server);
 	clear_bit(chan_index, &ses->chans_need_reconnect);
 	cifs_dbg(FYI, "Cleared reconnect bitmask for chan %lu; now 0x%lx\n",
 		 chan_index, ses->chans_need_reconnect);
@@ -114,7 +114,7 @@ bool
 cifs_chan_needs_reconnect(struct cifs_ses *ses,
 			    struct TCP_Server_Info *server)
 {
-	size_t chan_index = cifs_ses_get_chan_index(ses, server);
+	unsigned long chan_index = cifs_ses_get_chan_index(ses, server);
 	return CIFS_CHAN_NEEDS_RECONNECT(ses, chan_index);
 }
 
-- 
2.25.1