[CIFS] Rename three structures to avoid camel case

secMode to sec_mode
and
cifsTconInfo to cifs_tcon
and
cifsSesInfo to cifs_ses

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 45 insertions, 45 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 21bc83586beb..6d88b82537c3 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -79,8 +79,8 @@ cifs_reconnect(struct TCP_Server_Info *server)
 {
         int rc = 0;
         struct list_head *tmp, *tmp2;
-        struct cifsSesInfo *ses;
-        struct cifsTconInfo *tcon;
+        struct cifs_ses *ses;
+        struct cifs_tcon *tcon;
         struct mid_q_entry *mid_entry;
         struct list_head retry_list;
 
@@ -102,11 +102,11 @@ cifs_reconnect(struct TCP_Server_Info *server)
         cFYI(1, "%s: marking sessions and tcons for reconnect", __func__);
         spin_lock(&cifs_tcp_ses_lock);
         list_for_each(tmp, &server->smb_ses_list) {
-                ses = list_entry(tmp, struct cifsSesInfo, smb_ses_list);
+                ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
                 ses->need_reconnect = true;
                 ses->ipc_tid = 0;
                 list_for_each(tmp2, &ses->tcon_list) {
-                        tcon = list_entry(tmp2, struct cifsTconInfo, tcon_list);
+                        tcon = list_entry(tmp2, struct cifs_tcon, tcon_list);
                         tcon->need_reconnect = true;
                 }
         }
@@ -1597,10 +1597,10 @@ match_security(struct TCP_Server_Info *server, struct smb_vol *vol)
 
         /* now check if signing mode is acceptable */
         if ((secFlags & CIFSSEC_MAY_SIGN) == 0 &&
-            (server->secMode & SECMODE_SIGN_REQUIRED))
+            (server->sec_mode & SECMODE_SIGN_REQUIRED))
                         return false;
         else if (((secFlags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) &&
-                 (server->secMode &
+                 (server->sec_mode &
                   (SECMODE_SIGN_ENABLED|SECMODE_SIGN_REQUIRED)) == 0)
                         return false;
 
@@ -1827,7 +1827,7 @@ out_err:
         return ERR_PTR(rc);
 }
 
-static int match_session(struct cifsSesInfo *ses, struct smb_vol *vol)
+static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
 {
         switch (ses->server->secType) {
         case Kerberos:
@@ -1851,10 +1851,10 @@ static int match_session(struct cifsSesInfo *ses, struct smb_vol *vol)
         return 1;
 }
 
-static struct cifsSesInfo *
+static struct cifs_ses *
 cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
 {
-        struct cifsSesInfo *ses;
+        struct cifs_ses *ses;
 
         spin_lock(&cifs_tcp_ses_lock);
         list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) {
@@ -1869,7 +1869,7 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
 }
 
 static void
-cifs_put_smb_ses(struct cifsSesInfo *ses)
+cifs_put_smb_ses(struct cifs_ses *ses)
 {
         int xid;
         struct TCP_Server_Info *server = ses->server;
@@ -1895,11 +1895,11 @@ cifs_put_smb_ses(struct cifsSesInfo *ses)
 
 static bool warned_on_ntlm;  /* globals init to false automatically */
 
-static struct cifsSesInfo *
+static struct cifs_ses *
 cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
 {
         int rc = -ENOMEM, xid;
-        struct cifsSesInfo *ses;
+        struct cifs_ses *ses;
         struct sockaddr_in *addr = (struct sockaddr_in *)&server->dstaddr;
         struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&server->dstaddr;
 
@@ -2002,7 +2002,7 @@ get_ses_fail:
         return ERR_PTR(rc);
 }
 
-static int match_tcon(struct cifsTconInfo *tcon, const char *unc)
+static int match_tcon(struct cifs_tcon *tcon, const char *unc)
 {
         if (tcon->tidStatus == CifsExiting)
                 return 0;
@@ -2011,15 +2011,15 @@ static int match_tcon(struct cifsTconInfo *tcon, const char *unc)
         return 1;
 }
 
-static struct cifsTconInfo *
-cifs_find_tcon(struct cifsSesInfo *ses, const char *unc)
+static struct cifs_tcon *
+cifs_find_tcon(struct cifs_ses *ses, const char *unc)
 {
         struct list_head *tmp;
-        struct cifsTconInfo *tcon;
+        struct cifs_tcon *tcon;
 
         spin_lock(&cifs_tcp_ses_lock);
         list_for_each(tmp, &ses->tcon_list) {
-                tcon = list_entry(tmp, struct cifsTconInfo, tcon_list);
+                tcon = list_entry(tmp, struct cifs_tcon, tcon_list);
                 if (!match_tcon(tcon, unc))
                         continue;
                 ++tcon->tc_count;
@@ -2031,10 +2031,10 @@ cifs_find_tcon(struct cifsSesInfo *ses, const char *unc)
 }
 
 static void
-cifs_put_tcon(struct cifsTconInfo *tcon)
+cifs_put_tcon(struct cifs_tcon *tcon)
 {
         int xid;
-        struct cifsSesInfo *ses = tcon->ses;
+        struct cifs_ses *ses = tcon->ses;
 
         cFYI(1, "%s: tc_count=%d\n", __func__, tcon->tc_count);
         spin_lock(&cifs_tcp_ses_lock);
@@ -2055,11 +2055,11 @@ cifs_put_tcon(struct cifsTconInfo *tcon)
         cifs_put_smb_ses(ses);
 }
 
-static struct cifsTconInfo *
-cifs_get_tcon(struct cifsSesInfo *ses, struct smb_vol *volume_info)
+static struct cifs_tcon *
+cifs_get_tcon(struct cifs_ses *ses, struct smb_vol *volume_info)
 {
         int rc, xid;
-        struct cifsTconInfo *tcon;
+        struct cifs_tcon *tcon;
 
         tcon = cifs_find_tcon(ses, volume_info->UNC);
         if (tcon) {
@@ -2197,8 +2197,8 @@ cifs_match_super(struct super_block *sb, void *data)
         struct smb_vol *volume_info;
         struct cifs_sb_info *cifs_sb;
         struct TCP_Server_Info *tcp_srv;
-        struct cifsSesInfo *ses;
-        struct cifsTconInfo *tcon;
+        struct cifs_ses *ses;
+        struct cifs_tcon *tcon;
         struct tcon_link *tlink;
         struct sockaddr_storage addr;
         int rc = 0;
@@ -2243,7 +2243,7 @@ out:
 }
 
 int
-get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, const char *old_path,
+get_dfs_path(int xid, struct cifs_ses *pSesInfo, const char *old_path,
              const struct nls_table *nls_codepage, unsigned int *pnum_referrals,
              struct dfs_info3_param **preferrals, int remap)
 {
@@ -2542,7 +2542,7 @@ ip_connect(struct TCP_Server_Info *server)
         return generic_ip_connect(server);
 }
 
-void reset_cifs_unix_caps(int xid, struct cifsTconInfo *tcon,
+void reset_cifs_unix_caps(int xid, struct cifs_tcon *tcon,
                           struct super_block *sb, struct smb_vol *vol_info)
 {
         /* if we are reconnecting then should we check to see if
@@ -2771,7 +2771,7 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
 #define CIFS_DEFAULT_WSIZE (1024 * 1024)
 
 static unsigned int
-cifs_negotiate_wsize(struct cifsTconInfo *tcon, struct smb_vol *pvolume_info)
+cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *pvolume_info)
 {
         __u64 unix_cap = le64_to_cpu(tcon->fsUnixInfo.Capability);
         struct TCP_Server_Info *server = tcon->ses->server;
@@ -2793,7 +2793,7 @@ cifs_negotiate_wsize(struct cifsTconInfo *tcon, struct smb_vol *pvolume_info)
 }
 
 static int
-is_path_accessible(int xid, struct cifsTconInfo *tcon,
+is_path_accessible(int xid, struct cifs_tcon *tcon,
                    struct cifs_sb_info *cifs_sb, const char *full_path)
 {
         int rc;
@@ -2868,7 +2868,7 @@ build_unc_path_to_root(const struct smb_vol *volume_info,
  * determine whether there were referrals.
  */
 static int
-expand_dfs_referral(int xid, struct cifsSesInfo *pSesInfo,
+expand_dfs_referral(int xid, struct cifs_ses *pSesInfo,
                     struct smb_vol *volume_info, struct cifs_sb_info *cifs_sb,
                     int check_prefix)
 {
@@ -2973,8 +2973,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 {
         int rc = 0;
         int xid;
-        struct cifsSesInfo *pSesInfo;
-        struct cifsTconInfo *tcon;
+        struct cifs_ses *pSesInfo;
+        struct cifs_tcon *tcon;
         struct TCP_Server_Info *srvTcp;
         char   *full_path;
         struct tcon_link *tlink;
@@ -3172,8 +3172,8 @@ out:
 }
 
 int
-CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
-         const char *tree, struct cifsTconInfo *tcon,
+CIFSTCon(unsigned int xid, struct cifs_ses *ses,
+         const char *tree, struct cifs_tcon *tcon,
          const struct nls_table *nls_codepage)
 {
         struct smb_hdr *smb_buffer;
@@ -3205,7 +3205,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
         pSMB->AndXCommand = 0xFF;
         pSMB->Flags = cpu_to_le16(TCON_EXTENDED_SECINFO);
         bcc_ptr = &pSMB->Password[0];
-        if ((ses->server->secMode) & SECMODE_USER) {
+        if ((ses->server->sec_mode) & SECMODE_USER) {
                 pSMB->PasswordLength = cpu_to_le16(1);  /* minimum */
                 *bcc_ptr = 0; /* password is null byte */
                 bcc_ptr++;              /* skip password */
@@ -3222,7 +3222,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
                 if ((global_secflags & CIFSSEC_MAY_LANMAN) &&
                     (ses->server->secType == LANMAN))
                         calc_lanman_hash(tcon->password, ses->server->cryptkey,
-                                         ses->server->secMode &
+                                         ses->server->sec_mode &
                                             SECMODE_PW_ENCRYPT ? true : false,
                                          bcc_ptr);
                 else
@@ -3238,7 +3238,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
                 }
         }
 
-        if (ses->server->secMode &
+        if (ses->server->sec_mode &
                         (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
                 smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE;
 
@@ -3353,7 +3353,7 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
         return 0;
 }
 
-int cifs_negotiate_protocol(unsigned int xid, struct cifsSesInfo *ses)
+int cifs_negotiate_protocol(unsigned int xid, struct cifs_ses *ses)
 {
         int rc = 0;
         struct TCP_Server_Info *server = ses->server;
@@ -3383,7 +3383,7 @@ int cifs_negotiate_protocol(unsigned int xid, struct cifsSesInfo *ses)
 }
 
 
-int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses,
+int cifs_setup_session(unsigned int xid, struct cifs_ses *ses,
                         struct nls_table *nls_info)
 {
         int rc = 0;
@@ -3395,7 +3395,7 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses,
                 ses->capabilities &= (~CAP_UNIX);
 
         cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d",
-                 server->secMode, server->capabilities, server->timeAdj);
+                 server->sec_mode, server->capabilities, server->timeAdj);
 
         rc = CIFS_SessSetup(xid, ses, nls_info);
         if (rc) {
@@ -3427,12 +3427,12 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *ses,
         return rc;
 }
 
-static struct cifsTconInfo *
+static struct cifs_tcon *
 cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
 {
-        struct cifsTconInfo *master_tcon = cifs_sb_master_tcon(cifs_sb);
-        struct cifsSesInfo *ses;
-        struct cifsTconInfo *tcon = NULL;
+        struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb);
+        struct cifs_ses *ses;
+        struct cifs_tcon *tcon = NULL;
         struct smb_vol *vol_info;
         char username[28]; /* big enough for "krb50x" + hex of ULONG_MAX 6+16 */
                            /* We used to have this as MAX_USERNAME which is   */
@@ -3465,7 +3465,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
 
         ses = cifs_get_smb_ses(master_tcon->ses->server, vol_info);
         if (IS_ERR(ses)) {
-                tcon = (struct cifsTconInfo *)ses;
+                tcon = (struct cifs_tcon *)ses;
                 cifs_put_tcp_session(master_tcon->ses->server);
                 goto out;
         }
@@ -3490,7 +3490,7 @@ cifs_sb_master_tlink(struct cifs_sb_info *cifs_sb)
         return cifs_sb->master_tlink;
 }
 
-struct cifsTconInfo *
+struct cifs_tcon *
 cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb)
 {
         return tlink_tcon(cifs_sb_master_tlink(cifs_sb));