diff options
| author | Steve French <stfrench@microsoft.com> | 2023-08-25 07:44:05 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2023-08-30 16:55:02 +0300 |
| commit | b3773b19d43f4e22d0c819a7514341b26e8fb4a8 (patch) | |
| tree | 161ae47423d270f10c167c8e489ef3e656a2a2b5 /fs/smb/client/smb2ops.c | |
| parent | 09ee7a3bf866c0fa5ee1914d2c65958559eb5b4c (diff) | |
| download | linux-b3773b19d43f4e22d0c819a7514341b26e8fb4a8.tar.xz | |
SMB3: rename macro CIFS_SERVER_IS_CHAN to avoid confusion
Since older dialects such as CIFS do not support multichannel
the macro CIFS_SERVER_IS_CHAN can be confusing (it requires SMB 3
or later) so shorten its name to "SERVER_IS_CHAN"
Suggested-by: Tom Talpey <tom@talpey.com>
Acked-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/smb/client/smb2ops.c')
| -rw-r--r-- | fs/smb/client/smb2ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 25a25193f962..67d5d7b2b1fd 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -178,7 +178,7 @@ smb2_set_credits(struct TCP_Server_Info *server, const int val) * ChannelSequence updated for all channels in primary channel so that consistent * across SMB3 requests sent on any channel. See MS-SMB2 3.2.4.1 and 3.2.7.1 */ - if (CIFS_SERVER_IS_CHAN(server)) + if (SERVER_IS_CHAN(server)) server->primary_server->channel_sequence_num++; else server->channel_sequence_num++; @@ -2406,7 +2406,7 @@ smb2_is_network_name_deleted(char *buf, struct TCP_Server_Info *server) return false; /* If server is a channel, select the primary channel */ - pserver = CIFS_SERVER_IS_CHAN(server) ? server->primary_server : server; + pserver = SERVER_IS_CHAN(server) ? server->primary_server : server; spin_lock(&cifs_tcp_ses_lock); list_for_each_entry(ses, &pserver->smb_ses_list, smb_ses_list) { @@ -4282,7 +4282,7 @@ smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key) u8 *ses_enc_key; /* If server is a channel, select the primary channel */ - pserver = CIFS_SERVER_IS_CHAN(server) ? server->primary_server : server; + pserver = SERVER_IS_CHAN(server) ? server->primary_server : server; spin_lock(&cifs_tcp_ses_lock); list_for_each_entry(ses, &pserver->smb_ses_list, smb_ses_list) { |