Skip to contentSkip to conversation

cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

PATCH In review Geert Uytterhoeven 2 participants 7 messages Jun 4, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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 protected]

---
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(-)
fs/cifs/cifsglob.h +1 -1
index 8fea2ddd2bd7af26..a9c026af21e1e9d1 100644
@@ -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
fs/cifs/sess.c +3 -3
index 1721a3b246942266..1a17ddd6abbe5778 100644
@@ -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);
 }
 
Signature · 1 line
2.25.1
#1 lore raw

Hi,

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Regards,
Shyam

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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 protected]

---
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(-)
fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c +1 -1
@@ -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

#2 lore raw

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Where can I find these submitted fixes?

As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK.

Thanks!

[1] https://lore.kernel.org/linux-next/[email protected]/

Quoted 87 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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 protected]

---
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(-)
fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c +1 -1
@@ -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)  {

fs/cifs/sess.c void

Quoted 10 lines
fs/cifs/sess.c +2 -2
-       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);  }

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw

Hi Geert,

You can find the updated patches in the linux-cifs mailing list about an hour ago.
Titled: Multichannel patches

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 4:39 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Where can I find these submitted fixes?

As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK.

Thanks!

[1] https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flinux-next%2F20210430174733.5a31d0c6%40canb.auug.org.au%2F&amp;data=04%7C01%7CShyam.Prasad%40microsoft.com%7C50e24fa9469045cee62208d9274937e2%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637584017711363338%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=WVfbz5WhzyupDUljqSmxlyCdSZtOPcdGxwYpoyqYXqA%3D&amp;reserved=0

Quoted 94 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad
<[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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")

---
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(-)
fs/cifs/cifsglob.h index renamed from fs/cifs/cifsglob.h +0 -0

8fea2ddd2bd7af26..a9c026af21e1e9d1 100644

fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c index renamed from fs/cifs/sess.c +0 -0

1721a3b246942266..1a17ddd6abbe5778 100644

fs/cifs/sess.c +2 -2
@@ -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);

fs/cifs/sess.c void

Quoted 10 lines
fs/cifs/sess.c +4 -1
+       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);  }

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#4 lore raw

Hi Shyam,

Quoted 2 lines · Shyam Prasad

You can find the updated patches in the linux-cifs mailing list about an hour ago.
Titled: Multichannel patches

The link in the updated PR still points to the old buggy patch.

Quoted 117 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 4:39 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Where can I find these submitted fixes?

As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK.

Thanks!

[1] https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flinux-next%2F20210430174733.5a31d0c6%40canb.auug.org.au%2F&amp;data=04%7C01%7CShyam.Prasad%40microsoft.com%7C50e24fa9469045cee62208d9274937e2%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637584017711363338%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=WVfbz5WhzyupDUljqSmxlyCdSZtOPcdGxwYpoyqYXqA%3D&amp;reserved=0

Quoted 96 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad
<[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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")

---
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(-)
fs/cifs/cifsglob.h index renamed from fs/cifs/cifsglob.h +0 -0

8fea2ddd2bd7af26..a9c026af21e1e9d1 100644

fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c index renamed from fs/cifs/sess.c +0 -0

1721a3b246942266..1a17ddd6abbe5778 100644

fs/cifs/sess.c +4 -2
@@ -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);
Quoted 8 lines

fs/cifs/sess.c

Quoted 8 lines
        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)  {
fs/cifs/sess.c +2 -1
-       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);  }

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#5 lore raw

Are you referring to this PR?
https://github.com/sprasad-microsoft/smb-kernel-client/pull/5

https://github.com/sprasad-microsoft/smb-kernel-client/commit/09d387ff8f064f4d1e7e8d15b248742bac9e12aa.patch
This patch is now using chans_need_reconnect as unsigned long instead of size_t
+ /*
+ * chans_need_reconnect is a bitmap indicating which of the channels
+ * under this smb session needs to be reconnected.
+ * If not multichannel session, only one bit will be used.
+ */
+ unsigned long chans_need_reconnect;

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 5:12 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

You can find the updated patches in the linux-cifs mailing list about an hour ago.
Titled: Multichannel patches

The link in the updated PR still points to the old buggy patch.

Quoted 126 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 4:39 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen
Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Where can I find these submitted fixes?

As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK.

Thanks!

[1]
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore
.kernel.org%2Flinux-next%2F20210430174733.5a31d0c6%40canb.auug.org.au% 2F&amp;data=04%7C01%7CShyam.Prasad%40microsoft.com%7Cf7e7a8acfce742a86 13d08d9274dd650%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637584037 569130123%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIi LCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=KtltZkg52K1iI84809CQTx kIN4OxmoxhRDZ%2B%2BW4hu00%3D&amp;reserved=0

Quoted 96 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad
<[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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")

---
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(-)
fs/cifs/cifsglob.h index renamed from fs/cifs/cifsglob.h +0 -0

8fea2ddd2bd7af26..a9c026af21e1e9d1 100644

fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c index renamed from fs/cifs/sess.c +0 -0

1721a3b246942266..1a17ddd6abbe5778 100644

fs/cifs/sess.c +4 -2
@@ -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);
Quoted 8 lines

fs/cifs/sess.c

Quoted 8 lines
        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)  {
fs/cifs/sess.c +2 -1
-       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);  }

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#6 lore raw

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Are you referring to this PR?
https://github.com/sprasad-microsoft/smb-kernel-client/pull/5

Yes, as that's what your email[2] is pointing to.

Review

Quoted 8 lines

https://github.com/sprasad-microsoft/smb-kernel-client/commit/09d387ff8f064f4d1e7e8d15b248742bac9e12aa.patch
This patch is now using chans_need_reconnect as unsigned long instead of size_t

(quoted diff) +6 -0
+       /*
+        * chans_need_reconnect is a bitmap indicating which of the channels
+        * under this smb session needs to be reconnected.
+        * If not multichannel session, only one bit will be used.
+        */
+       unsigned long chans_need_reconnect;

The commit in the PR has indeed been updated, but the link[3] in the pull request hasn't.

This makes it very difficult to find and track patches, and review commits hidden in pull requests that don't even contain the subjects of the patches in the pull summary. so searching in lore doesn't find them.
The Linux review policy requires _patches_ to be sent to public mailing lists.

Thanks for your cooperation!

[2] https://lore.kernel.org/linux-cifs/CANT5p=o6Oq-27Xj4Z6-XzXKL45Dwg7JjGw2HA9jv5+YFQKpHUg@mail.gmail.com/
[3] https://github.com/sprasad-microsoft/smb-kernel-client/commit/2615c7300f93a7ae2d9350da25ed117492f8edbf.patch

Quoted 141 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 5:12 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

You can find the updated patches in the linux-cifs mailing list about an hour ago.
Titled: Multichannel patches

The link in the updated PR still points to the old buggy patch.

Quoted 126 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 4:39 PM
To: Shyam Prasad <[email protected]>
Cc: Steve French <[email protected]>; [email protected]; [email protected]; [email protected]; Stephen
Rothwell <[email protected]>
Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

Hi Shyam,

Quoted 2 lines · Shyam Prasad

Thanks for the email.
I've already submitted the fix for this. You should see this fixed tomorrow.

Where can I find these submitted fixes?

As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK.

Thanks!

[1]
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore
.kernel.org%2Flinux-next%2F20210430174733.5a31d0c6%40canb.auug.org.au% 2F&amp;data=04%7C01%7CShyam.Prasad%40microsoft.com%7Cf7e7a8acfce742a86 13d08d9274dd650%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637584037 569130123%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIi LCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=KtltZkg52K1iI84809CQTx kIN4OxmoxhRDZ%2B%2BW4hu00%3D&amp;reserved=0

Quoted 96 lines

-----Original Message-----
From: Geert Uytterhoeven <[email protected]>
Sent: Friday, June 4, 2021 2:32 PM
To: Steve French <[email protected]>; Shyam Prasad
<[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long"

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")

---
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(-)
fs/cifs/cifsglob.h index renamed from fs/cifs/cifsglob.h +0 -0

8fea2ddd2bd7af26..a9c026af21e1e9d1 100644

fs/cifs/cifsglob.h +1 -1
@@ -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
fs/cifs/sess.c index renamed from fs/cifs/sess.c +0 -0

1721a3b246942266..1a17ddd6abbe5778 100644

fs/cifs/sess.c +4 -2
@@ -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);
Quoted 8 lines
Quoted 8 lines

fs/cifs/sess.c

Quoted 8 lines
        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)  {
fs/cifs/sess.c +2 -1
-       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);  }

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds