Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96daf2b0 authored by Steve French's avatar Steve French
Browse files

[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: default avatarSteve French <sfrench@us.ibm.com>
parent 07cc6cf9

fs/cifs/cache.c

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static char *extract_sharename(const char *treename) 
static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer,

				   uint16_t maxbuf)

{

	const struct cifsTconInfo *tcon = cookie_netfs_data;

	const struct cifs_tcon *tcon = cookie_netfs_data;

	char *sharename;

	uint16_t len;
@@ -173,7 +173,7 @@ cifs_fscache_super_get_aux(const void *cookie_netfs_data, void *buffer, 
			   uint16_t maxbuf)

{

	struct cifs_fscache_super_auxdata auxdata;

	const struct cifsTconInfo *tcon = cookie_netfs_data;

	const struct cifs_tcon *tcon = cookie_netfs_data;



	memset(&auxdata, 0, sizeof(auxdata));

	auxdata.resource_id = tcon->resource_id;
@@ -192,7 +192,7 @@ fscache_checkaux cifs_fscache_super_check_aux(void *cookie_netfs_data, 
					      uint16_t datalen)

{

	struct cifs_fscache_super_auxdata auxdata;

	const struct cifsTconInfo *tcon = cookie_netfs_data;

	const struct cifs_tcon *tcon = cookie_netfs_data;



	if (datalen != sizeof(auxdata))

		return FSCACHE_CHECKAUX_OBSOLETE;

fs/cifs/cifs_debug.c

+13 −13
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
	struct list_head *tmp1, *tmp2, *tmp3;

	struct mid_q_entry *mid_entry;

	struct TCP_Server_Info *server;

	struct cifsSesInfo *ses;

	struct cifsTconInfo *tcon;

	struct cifs_ses *ses;

	struct cifs_tcon *tcon;

	int i, j;

	__u32 dev_type;
@@ -152,7 +152,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
				    tcp_ses_list);

		i++;

		list_for_each(tmp2, &server->smb_ses_list) {

			ses = list_entry(tmp2, struct cifsSesInfo,

			ses = list_entry(tmp2, struct cifs_ses,

					 smb_ses_list);

			if ((ses->serverDomain == NULL) ||

				(ses->serverOS == NULL) ||
@@ -171,7 +171,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			seq_printf(m, "TCP status: %d\n\tLocal Users To "

				   "Server: %d SecMode: 0x%x Req On Wire: %d",

				   server->tcpStatus, server->srv_count,

				   server->secMode,

				   server->sec_mode,

				   atomic_read(&server->inFlight));



#ifdef CONFIG_CIFS_STATS2
@@ -183,7 +183,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			seq_puts(m, "\n\tShares:");

			j = 0;

			list_for_each(tmp3, &ses->tcon_list) {

				tcon = list_entry(tmp3, struct cifsTconInfo,

				tcon = list_entry(tmp3, struct cifs_tcon,

						  tcon_list);

				++j;

				dev_type = le32_to_cpu(tcon->fsDevInfo.DeviceType);
@@ -256,8 +256,8 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
	int rc;

	struct list_head *tmp1, *tmp2, *tmp3;

	struct TCP_Server_Info *server;

	struct cifsSesInfo *ses;

	struct cifsTconInfo *tcon;

	struct cifs_ses *ses;

	struct cifs_tcon *tcon;



	rc = get_user(c, buffer);

	if (rc)
@@ -273,11 +273,11 @@ static ssize_t cifs_stats_proc_write(struct file *file, 
			server = list_entry(tmp1, struct TCP_Server_Info,

					    tcp_ses_list);

			list_for_each(tmp2, &server->smb_ses_list) {

				ses = list_entry(tmp2, struct cifsSesInfo,

				ses = list_entry(tmp2, struct cifs_ses,

						 smb_ses_list);

				list_for_each(tmp3, &ses->tcon_list) {

					tcon = list_entry(tmp3,

							  struct cifsTconInfo,

							  struct cifs_tcon,

							  tcon_list);

					atomic_set(&tcon->num_smbs_sent, 0);

					atomic_set(&tcon->num_writes, 0);
@@ -312,8 +312,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
	int i;

	struct list_head *tmp1, *tmp2, *tmp3;

	struct TCP_Server_Info *server;

	struct cifsSesInfo *ses;

	struct cifsTconInfo *tcon;

	struct cifs_ses *ses;

	struct cifs_tcon *tcon;



	seq_printf(m,

			"Resources in use\nCIFS Session: %d\n",
@@ -346,11 +346,11 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v) 
		server = list_entry(tmp1, struct TCP_Server_Info,

				    tcp_ses_list);

		list_for_each(tmp2, &server->smb_ses_list) {

			ses = list_entry(tmp2, struct cifsSesInfo,

			ses = list_entry(tmp2, struct cifs_ses,

					 smb_ses_list);

			list_for_each(tmp3, &ses->tcon_list) {

				tcon = list_entry(tmp3,

						  struct cifsTconInfo,

						  struct cifs_tcon,

						  tcon_list);

				i++;

				seq_printf(m, "\n%d) %s", i, tcon->treeName);

fs/cifs/cifs_dfs_ref.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static struct vfsmount *cifs_dfs_do_automount(struct dentry *mntpt) 
	struct dfs_info3_param *referrals = NULL;

	unsigned int num_referrals = 0;

	struct cifs_sb_info *cifs_sb;

	struct cifsSesInfo *ses;

	struct cifs_ses *ses;

	char *full_path;

	int xid, i;

	int rc;

fs/cifs/cifs_spnego.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct key_type cifs_spnego_key_type = { 


/* get a key struct with a SPNEGO security blob, suitable for session setup */

struct key *

cifs_get_spnego_key(struct cifsSesInfo *sesInfo)

cifs_get_spnego_key(struct cifs_ses *sesInfo)

{

	struct TCP_Server_Info *server = sesInfo->server;

	struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr;

fs/cifs/cifs_spnego.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct cifs_spnego_msg { 


#ifdef __KERNEL__

extern struct key_type cifs_spnego_key_type;

extern struct key *cifs_get_spnego_key(struct cifsSesInfo *sesInfo);

extern struct key *cifs_get_spnego_key(struct cifs_ses *sesInfo);

#endif /* KERNEL */



#endif /* _CIFS_SPNEGO_H */