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

Commit 582d21e5 authored by Steve French's avatar Steve French
Browse files

[CIFS] cleanup old checkpatch warnings 



Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent ed5f0370

fs/cifs/cifssmb.c

+33 −18
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ SMBLegacyOpen(const int xid, struct cifsTconInfo *tcon, 
	} else {

	/* BB verify if wct == 15 */



/*		*pOplock = pSMBr->OplockLevel; */  /* BB take from action field BB */

/*		*pOplock = pSMBr->OplockLevel; */ /* BB take from action field*/



		*netfid = pSMBr->Fid;   /* cifs fid stays in le */

		/* Let caller know file was created so we can set the mode. */
@@ -2925,7 +2925,8 @@ CIFSSMBSetPosixACL(const int xid, struct cifsTconInfo *tcon, 
	}

	params = 6 + name_len;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB size from sess */

	/* BB find max SMB size from sess */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -3322,7 +3323,8 @@ CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, 
	params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;

	pSMB->TotalDataCount = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(4000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(4000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -3922,7 +3924,8 @@ CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, 
	pSMB->DataCount = 0;

	pSMB->DataOffset = 0;

	pSMB->MaxParameterCount = 0;

	pSMB->MaxDataCount = cpu_to_le16(4000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(4000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4230,7 +4233,8 @@ CIFSSMBQFSAttributeInfo(const int xid, struct cifsTconInfo *tcon) 
	params = 2;	/* level */

	pSMB->TotalDataCount = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4299,7 +4303,8 @@ CIFSSMBQFSDeviceInfo(const int xid, struct cifsTconInfo *tcon) 
	params = 2;	/* level */

	pSMB->TotalDataCount = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4370,7 +4375,8 @@ CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon) 
	pSMB->DataCount = 0;

	pSMB->DataOffset = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(100);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(100);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4445,7 +4451,8 @@ CIFSSMBSetFSUnixInfo(const int xid, struct cifsTconInfo *tcon, __u64 cap) 
	offset = param_offset + params;



	pSMB->MaxParameterCount = cpu_to_le16(4);

	pSMB->MaxDataCount = cpu_to_le16(100);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(100);

	pSMB->SetupCount = 1;

	pSMB->Reserved3 = 0;

	pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FS_INFORMATION);
@@ -4513,7 +4520,8 @@ CIFSSMBQFSPosixInfo(const int xid, struct cifsTconInfo *tcon, 
	pSMB->DataCount = 0;

	pSMB->DataOffset = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(100);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(100);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4703,7 +4711,8 @@ CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, 


	count = sizeof(struct file_end_of_file_info);

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find max SMB PDU from sess */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->SetupCount = 1;

	pSMB->Reserved3 = 0;

	pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);
@@ -4790,7 +4799,8 @@ CIFSSMBSetFileTimes(const int xid, struct cifsTconInfo *tcon, 


	count = sizeof(FILE_BASIC_INFO);

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find max SMB PDU from sess */

	/* BB find max SMB PDU from sess */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->SetupCount = 1;

	pSMB->Reserved3 = 0;

	pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION);
@@ -4857,7 +4867,8 @@ CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, const char *fileName, 
	params = 6 + name_len;

	count = sizeof(FILE_BASIC_INFO);

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -4987,7 +4998,8 @@ CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *tcon, 
	params = 6 + name_len;

	count = sizeof(FILE_UNIX_BASIC_INFO);

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -5170,7 +5182,8 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
	params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;

	pSMB->TotalDataCount = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(4000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(4000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -5318,7 +5331,8 @@ ssize_t CIFSSMBQueryEA(const int xid, struct cifsTconInfo *tcon, 
	params = 2 /* level */ + 4 /* reserved */ + name_len /* includes NUL */;

	pSMB->TotalDataCount = 0;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(4000);	/* BB find exact max SMB PDU from sess structure BB */

	/* BB find exact max SMB PDU from sess structure BB */

	pSMB->MaxDataCount = cpu_to_le16(4000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;
@@ -5476,7 +5490,8 @@ CIFSSMBSetEA(const int xid, struct cifsTconInfo *tcon, const char *fileName, 


	count = sizeof(*parm_data) + ea_value_len + name_len;

	pSMB->MaxParameterCount = cpu_to_le16(2);

	pSMB->MaxDataCount = cpu_to_le16(1000);	/* BB find max SMB size from sess */

	/* BB find max SMB PDU from sess */

	pSMB->MaxDataCount = cpu_to_le16(1000);

	pSMB->MaxSetupCount = 0;

	pSMB->Reserved = 0;

	pSMB->Flags = 0;

fs/cifs/connect.c

+4 −3
Original line number Diff line number Diff line
@@ -2321,9 +2321,10 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, 
	user = ses->userName;

	domain = ses->domainName;

	smb_buffer = cifs_buf_get();

	if (smb_buffer == NULL) {



	if (smb_buffer == NULL)

		return -ENOMEM;

	}



	smb_buffer_response = smb_buffer;

	pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer;

fs/cifs/netmisc.c

+3 −3
Original line number Diff line number Diff line
@@ -141,11 +141,11 @@ cifs_inet_pton(const int address_family, const char *cp, void *dst) 
	int ret = 0;



	/* calculate length by finding first slash or NULL */

	if (address_family == AF_INET) {

	if (address_family == AF_INET)

		ret = in4_pton(cp, -1 /* len */, dst, '\\', NULL);

	} else if (address_family == AF_INET6) {

	else if (address_family == AF_INET6)

		ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL);

	}



	cFYI(DBG2, ("address conversion returned %d for %s", ret, cp));

	if (ret > 0)

		ret = 1;

fs/cifs/ntlmssp.h

+2 −2

File changed.

Contains only whitespace changes.

fs/cifs/cifsproto.h

+3 −3

File changed.

Contains only whitespace changes.