mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
[CIFS] cleanup old checkpatch warnings
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
parent
ed5f037005
commit
582d21e5e3
@ -93,7 +93,7 @@ extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time);
|
||||
|
||||
extern int cifs_get_inode_info(struct inode **pinode,
|
||||
const unsigned char *search_path,
|
||||
FILE_ALL_INFO * pfile_info,
|
||||
FILE_ALL_INFO *pfile_info,
|
||||
struct super_block *sb, int xid, const __u16 *pfid);
|
||||
extern int cifs_get_inode_info_unix(struct inode **pinode,
|
||||
const unsigned char *search_path,
|
||||
@ -130,7 +130,7 @@ extern int CIFSFindClose(const int, struct cifsTconInfo *tcon,
|
||||
|
||||
extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName,
|
||||
FILE_ALL_INFO * findData,
|
||||
FILE_ALL_INFO *findData,
|
||||
int legacy /* whether to use old info level */,
|
||||
const struct nls_table *nls_codepage, int remap);
|
||||
extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon,
|
||||
@ -141,7 +141,7 @@ extern int SMBQueryInformation(const int xid, struct cifsTconInfo *tcon,
|
||||
extern int CIFSSMBUnixQPathInfo(const int xid,
|
||||
struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName,
|
||||
FILE_UNIX_BASIC_INFO * pFindData,
|
||||
FILE_UNIX_BASIC_INFO *pFindData,
|
||||
const struct nls_table *nls_codepage, int remap);
|
||||
|
||||
extern int CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses,
|
||||
|
@ -1247,7 +1247,7 @@ OldOpenRetry:
|
||||
} 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. */
|
||||
@ -1944,7 +1944,7 @@ renameRetry:
|
||||
/* protocol requires ASCII signature byte on Unicode string */
|
||||
pSMB->OldFileName[name_len + 1] = 0x00;
|
||||
name_len2 =
|
||||
cifsConvertToUCS((__le16 *) &pSMB->OldFileName[name_len + 2],
|
||||
cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
|
||||
toName, PATH_MAX, nls_codepage, remap);
|
||||
name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ;
|
||||
name_len2 *= 2; /* convert to bytes */
|
||||
@ -2925,7 +2925,8 @@ setAclRetry:
|
||||
}
|
||||
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 @@ QPathInfoRetry:
|
||||
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;
|
||||
@ -3388,7 +3390,7 @@ QPathInfoRetry:
|
||||
int
|
||||
CIFSSMBUnixQPathInfo(const int xid, struct cifsTconInfo *tcon,
|
||||
const unsigned char *searchName,
|
||||
FILE_UNIX_BASIC_INFO * pFindData,
|
||||
FILE_UNIX_BASIC_INFO *pFindData,
|
||||
const struct nls_table *nls_codepage, int remap)
|
||||
{
|
||||
/* SMB_QUERY_FILE_UNIX_BASIC */
|
||||
@ -3922,7 +3924,8 @@ getDFSRetry:
|
||||
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 @@ QFSAttributeRetry:
|
||||
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 @@ QFSDeviceRetry:
|
||||
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 @@ QFSUnixRetry:
|
||||
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 @@ SETFSUnixRetry:
|
||||
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 @@ QFSPosixRetry:
|
||||
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 @@ SetTimesRetry:
|
||||
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 @@ setPermsRetry:
|
||||
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 @@ QAllEAsRetry:
|
||||
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 @@ QEARetry:
|
||||
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 @@ SetEARetry:
|
||||
|
||||
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;
|
||||
|
@ -1820,7 +1820,7 @@ convert_delimiter(char *path, char delim)
|
||||
if (path == NULL)
|
||||
return;
|
||||
|
||||
if (delim == '/')
|
||||
if (delim == '/')
|
||||
old_delim = '\\';
|
||||
else
|
||||
old_delim = '/';
|
||||
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -64,7 +64,7 @@ typedef struct _SECURITY_BUFFER {
|
||||
} __attribute__((packed)) SECURITY_BUFFER;
|
||||
|
||||
typedef struct _NEGOTIATE_MESSAGE {
|
||||
__u8 Signature[sizeof (NTLMSSP_SIGNATURE)];
|
||||
__u8 Signature[sizeof(NTLMSSP_SIGNATURE)];
|
||||
__le32 MessageType; /* 1 */
|
||||
__le32 NegotiateFlags;
|
||||
SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */
|
||||
@ -74,7 +74,7 @@ typedef struct _NEGOTIATE_MESSAGE {
|
||||
} __attribute__((packed)) NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE;
|
||||
|
||||
typedef struct _CHALLENGE_MESSAGE {
|
||||
__u8 Signature[sizeof (NTLMSSP_SIGNATURE)];
|
||||
__u8 Signature[sizeof(NTLMSSP_SIGNATURE)];
|
||||
__le32 MessageType; /* 2 */
|
||||
SECURITY_BUFFER TargetName;
|
||||
__le32 NegotiateFlags;
|
||||
|
Loading…
Reference in New Issue
Block a user