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>

diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c
index aec6e9137474217bbe67d9b61be72689a1ac78ae..76922fcc4bc6e5c1282e8e6a7e38f1a102cb900b 100644 (file)
--- a/fs/smb/client/cifs_debug.c
+++ b/fs/smb/client/cifs_debug.c
@@ -331,7 +331,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
        spin_lock(&cifs_tcp_ses_lock);
        list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
                /* channel info will be printed as a part of sessions below */
-               if (CIFS_SERVER_IS_CHAN(server))
+               if (SERVER_IS_CHAN(server))
                        continue;
 
                c++;

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 3271be65fd6ffdb86212b80e8f48335fa9634df9..259e231f8b4f51f31d534676c4f55c8f5e0fe221 100644 (file)
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -745,7 +745,7 @@ struct TCP_Server_Info {
         * primary_server holds the ref-counted
         * pointer to primary channel connection for the session.
         */
-#define CIFS_SERVER_IS_CHAN(server)    (!!(server)->primary_server)
+#define SERVER_IS_CHAN(server) (!!(server)->primary_server)
        struct TCP_Server_Info *primary_server;
        __u16 channel_sequence_num;  /* incremented on primary channel on each chan reconnect */
 

diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index f2d08d0f93732214ca6f9366f99decea5f1f67e4..3bd71f982170117b658a9fc3dfd98b4b5e36721c 100644 (file)
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -154,7 +154,7 @@ cifs_signal_cifsd_for_reconnect(struct TCP_Server_Info *server,
        int i;
 
        /* 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(&pserver->srv_lock);
        if (!all_channels) {
@@ -202,7 +202,7 @@ cifs_mark_tcp_ses_conns_for_reconnect(struct TCP_Server_Info *server,
        cifs_dbg(FYI, "%s: marking necessary sessions and tcons for reconnect\n", __func__);
 
        /* 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);
@@ -1551,7 +1551,7 @@ cifs_find_tcp_session(struct smb3_fs_context *ctx)
                 * Skip ses channels since they're only handled in lower layers
                 * (e.g. cifs_send_recv).
                 */
-               if (CIFS_SERVER_IS_CHAN(server) ||
+               if (SERVER_IS_CHAN(server) ||
                    !match_server(server, ctx, false)) {
                        spin_unlock(&server->srv_lock);
                        continue;
@@ -1587,7 +1587,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect)
        spin_unlock(&cifs_tcp_ses_lock);
 
        /* For secondary channels, we pick up ref-count on the primary server */
-       if (CIFS_SERVER_IS_CHAN(server))
+       if (SERVER_IS_CHAN(server))
                cifs_put_tcp_session(server->primary_server, from_reconnect);
 
        cancel_delayed_work_sync(&server->echo);
@@ -1793,7 +1793,7 @@ out_err_crypto_release:
 
 out_err:
        if (tcp_ses) {
-               if (CIFS_SERVER_IS_CHAN(tcp_ses))
+               if (SERVER_IS_CHAN(tcp_ses))
                        cifs_put_tcp_session(tcp_ses->primary_server, false);
                kfree(tcp_ses->hostname);
                kfree(tcp_ses->leaf_fullpath);
@@ -3814,7 +3814,7 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,
                   struct nls_table *nls_info)
 {
        int rc = -ENOSYS;
-       struct TCP_Server_Info *pserver = CIFS_SERVER_IS_CHAN(server) ? server->primary_server : server;
+       struct TCP_Server_Info *pserver = SERVER_IS_CHAN(server) ? server->primary_server : server;
        struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&pserver->dstaddr;
        struct sockaddr_in *addr = (struct sockaddr_in *)&pserver->dstaddr;
        bool is_binding = false;

diff --git a/fs/smb/client/misc.c b/fs/smb/client/misc.c
index d7e85d9a2655315eedb1cb8f774f9227279e56aa..366b755ca9130df5177bd92ea7d1f940c18cbf1f 100644 (file)
--- a/fs/smb/client/misc.c
+++ b/fs/smb/client/misc.c
@@ -476,7 +476,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv)
                return false;
 
        /* If server is a channel, select the primary channel */
-       pserver = CIFS_SERVER_IS_CHAN(srv) ? srv->primary_server : srv;
+       pserver = SERVER_IS_CHAN(srv) ? srv->primary_server : srv;
 
        /* look up tcon based on tid & uid */
        spin_lock(&cifs_tcp_ses_lock);

diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index 5292216d994777883f143e8205e589225b5333fa..79f26c560edf89691499a086a8c23f576c936b71 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -323,12 +323,12 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
        ses->chans[chan_index].iface = iface;
 
        /* No iface is found. if secondary chan, drop connection */
-       if (!iface && CIFS_SERVER_IS_CHAN(server))
+       if (!iface && SERVER_IS_CHAN(server))
                ses->chans[chan_index].server = NULL;
 
        spin_unlock(&ses->chan_lock);
 
-       if (!iface && CIFS_SERVER_IS_CHAN(server))
+       if (!iface && SERVER_IS_CHAN(server))
                cifs_put_tcp_session(server, false);
 
        return rc;

diff --git a/fs/smb/client/smb2misc.c b/fs/smb/client/smb2misc.c
index 3935a60db5c3107f04f333a5a3f8ff1356077e4e..25f7cd6f23d64cfa36e88982db4965a94eb816da 100644 (file)
--- a/fs/smb/client/smb2misc.c
+++ b/fs/smb/client/smb2misc.c
@@ -145,7 +145,7 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *server)
        __u64 mid;
 
        /* 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;
 
        /*
         * Add function to do table lookup of StructureSize by command
@@ -623,7 +623,7 @@ smb2_is_valid_lease_break(char *buffer, struct TCP_Server_Info *server)
        cifs_dbg(FYI, "Checking for lease break\n");
 
        /* 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;
 
        /* look up tcon based on tid & uid */
        spin_lock(&cifs_tcp_ses_lock);
@@ -698,7 +698,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
        cifs_dbg(FYI, "oplock level 0x%x\n", rsp->OplockLevel);
 
        /* 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;
 
        /* look up tcon based on tid & uid */
        spin_lock(&cifs_tcp_ses_lock);

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 25a25193f962117763930823a3075413f24af99c..67d5d7b2b1fdae040620ee9ed4f5135ddb27993d 100644 (file)
--- 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) {

diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 9c7e46b7e7c7a1091bb962f89660c336b7812973..d936c07a4b475425f429ce5676f65935b7d1e677 100644 (file)
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -96,7 +96,7 @@ smb2_hdr_assemble(struct smb2_hdr *shdr, __le16 smb2_cmd,
                /* After reconnect SMB3 must set ChannelSequence on subsequent reqs */
                smb3_hdr = (struct smb3_hdr_req *)shdr;
                /* if primary channel is not set yet, use default channel for chan sequence num */
-               if (CIFS_SERVER_IS_CHAN(server))
+               if (SERVER_IS_CHAN(server))
                        smb3_hdr->ChannelSequence =
                                cpu_to_le16(server->primary_server->channel_sequence_num);
                else
@@ -564,7 +564,7 @@ assemble_neg_contexts(struct smb2_negotiate_req *req,
         * secondary channels don't have the hostname field populated
         * use the hostname field in the primary channel instead
         */
-       pserver = CIFS_SERVER_IS_CHAN(server) ? server->primary_server : server;
+       pserver = SERVER_IS_CHAN(server) ? server->primary_server : server;
        cifs_server_lock(pserver);
        hostname = pserver->hostname;
        if (hostname && (hostname[0] != 0)) {
@@ -3796,7 +3796,7 @@ void smb2_reconnect_server(struct work_struct *work)
        bool resched = 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;
 
        /* Prevent simultaneous reconnects that can corrupt tcon->rlist list */
        mutex_lock(&pserver->reconnect_mutex);

diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c
index 7676091b3e77a49d70a23dabc156fda67a458f7b..23c50ed7d4b590d9802ba15c9f9b2d263ac86753 100644 (file)
--- a/fs/smb/client/smb2transport.c
+++ b/fs/smb/client/smb2transport.c
@@ -86,7 +86,7 @@ int smb2_get_sign_key(__u64 ses_id, struct TCP_Server_Info *server, u8 *key)
        spin_lock(&cifs_tcp_ses_lock);
 
        /* 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;
 
        list_for_each_entry(ses, &pserver->smb_ses_list, smb_ses_list) {
                if (ses->Suid == ses_id)
@@ -149,7 +149,7 @@ smb2_find_smb_ses_unlocked(struct TCP_Server_Info *server, __u64 ses_id)
        struct cifs_ses *ses;
 
        /* 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;
 
        list_for_each_entry(ses, &pserver->smb_ses_list, smb_ses_list) {
                if (ses->Suid != ses_id)