Commit 289ebd9a authored Sep 19, 2024 by Namjae Jeon Committed by Steve French Sep 20, 2024

ksmbd: fix warning: comparison of distinct pointer types lacks a cast



smb2pdu.c: In function ‘smb2_open’:
./include/linux/minmax.h:20:28: warning: comparison of distinct
pointer types lacks a cast
   20 |  (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
      |                            ^~
./include/linux/minmax.h:26:4: note: in expansion of macro ‘__typecheck’
   26 |   (__typecheck(x, y) && __no_side_effects(x, y))
      |    ^~~~~~~~~~~
./include/linux/minmax.h:36:24: note: in expansion of macro ‘__safe_cmp’
   36 |  __builtin_choose_expr(__safe_cmp(x, y), \
      |                        ^~~~~~~~~~
./include/linux/minmax.h:45:19: note: in expansion of macro ‘__careful_cmp’
   45 | #define min(x, y) __careful_cmp(x, y, <)
      |                   ^~~~~~~~~~~~~
/home/linkinjeon/git/smbd_work/ksmbd/smb2pdu.c:3713:27: note: in
expansion of macro ‘min’
 3713 |     fp->durable_timeout = min(dh_info.timeout,

Fixes: c8efcc78 ("ksmbd: add support for durable handles v1/v2")
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

parent 4e0373f1

fs/smb/server/smb2pdu.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -3531,7 +3531,8 @@ int smb2_open(struct ksmbd_work *work)
		memcpy(fp->create_guid, dh_info.CreateGuid,
		SMB2_CREATE_GUID_SIZE);
		if (dh_info.timeout)
		fp->durable_timeout = min(dh_info.timeout,
		fp->durable_timeout =
		min_t(unsigned int, dh_info.timeout,
		DURABLE_HANDLE_MAX_TIMEOUT);
		else
		fp->durable_timeout = 60;

fs/smb/server/vfs_cache.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,8 +100,8 @@ struct ksmbd_file {
		struct list_head blocked_works;
		struct list_head lock_list;

		int durable_timeout;
		int durable_scavenger_timeout;
		unsigned int durable_timeout;
		unsigned int durable_scavenger_timeout;

		/* if ls is happening on directory, below is valid*/
		struct ksmbd_readdir_data readdir_data;