Commit 3870253e authored by Steve French's avatar Steve French
Browse files

[CIFS] more whitespace fixes 



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

fs/cifs/netmisc.c

+42 −40
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 *   Error mapping routines from Samba libsmb/errormap.c

 *   Copyright (C) Andrew Tridgell 2001

 *

 *

 *   This program is free software;  you can redistribute it and/or modify

 *   it under the terms of the GNU General Public License as published by

 *   the Free Software Foundation; either version 2 of the License, or
@@ -138,8 +137,8 @@ cifs_inet_pton(int address_family, char *cp,void *dst) 
	int ret = 0;



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

	/* BB Should we convert '/' slash to '\' here since it seems already done

	   before this */

	/* BB Should we convert '/' slash to '\' here since it seems already

	 * done before this */

	if ( address_family == AF_INET ) {

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

	} else if ( address_family == AF_INET6 ) {
@@ -332,8 +331,8 @@ static const struct { 
	ERRHRD, ERRgeneral, NT_STATUS_FILE_INVALID}, {

	ERRHRD, ERRgeneral, NT_STATUS_ALLOTTED_SPACE_EXCEEDED},

/*	{ This NT error code was 'sqashed'

	 from NT_STATUS_INSUFFICIENT_RESOURCES to NT_STATUS_INSUFF_SERVER_RESOURCES 

	 during the session setup } */

	 from NT_STATUS_INSUFFICIENT_RESOURCES to

	 NT_STATUS_INSUFF_SERVER_RESOURCES during the session setup } */

	{

	ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES}, {

	ERRDOS, ERRbadpath, NT_STATUS_DFS_EXIT_PATH_FOUND}, {
@@ -577,8 +576,8 @@ static const struct { 
	ERRDOS, 19, NT_STATUS_TOO_LATE}, {

	ERRDOS, ERRnoaccess, NT_STATUS_NO_TRUST_LSA_SECRET},

/*	{ This NT error code was 'sqashed'

	 from NT_STATUS_NO_TRUST_SAM_ACCOUNT to NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 

	 during the session setup } */

	 from NT_STATUS_NO_TRUST_SAM_ACCOUNT to

	 NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE during the session setup } */

	{

	ERRDOS, ERRnoaccess, NT_STATUS_NO_TRUST_SAM_ACCOUNT}, {

	ERRDOS, ERRnoaccess, NT_STATUS_TRUSTED_DOMAIN_FAILURE}, {
@@ -771,7 +770,8 @@ map_smb_to_linux_error(struct smb_hdr *smb) 
		return 0;



	if (smb->Flags2 & SMBFLG2_ERR_STATUS) {

		/* translate the newer STATUS codes to old style errors and then to POSIX errors */

		/* translate the newer STATUS codes to old style SMB errors

		 * and then to POSIX errors */

		__u32 err = le32_to_cpu(smb->Status.CifsError);

		if (cifsFYI & CIFS_RC)

			cifs_print_status(err);
@@ -784,7 +784,7 @@ map_smb_to_linux_error(struct smb_hdr *smb) 
	/* old style errors */



	/* DOS class smb error codes - map DOS */

	if (smberrclass == ERRDOS) {	/* one byte field no need to byte reverse */

	if (smberrclass == ERRDOS) {  /* 1 byte field no need to byte reverse */

		for (i = 0;

		     i <

		     sizeof (mapping_table_ERRDOS) /
@@ -795,7 +795,7 @@ map_smb_to_linux_error(struct smb_hdr *smb) 
				rc = mapping_table_ERRDOS[i].posix_code;

				break;

			}

			/* else try the next error mapping one to see if it will match */

			/* else try next error mapping one to see if match */

		}

	} else if (smberrclass == ERRSRV) {   /* server class of error codes */

		for (i = 0;
@@ -808,14 +808,16 @@ map_smb_to_linux_error(struct smb_hdr *smb) 
				rc = mapping_table_ERRSRV[i].posix_code;

				break;

			}

			/* else try the next error mapping one to see if it will match */

			/* else try next error mapping to see if match */

		}

	}

	/* else ERRHRD class errors or junk  - return EIO */



	cFYI(1, (" !!Mapping smb error code %d to POSIX err %d !!", smberrcode,rc));

	cFYI(1, (" !!Mapping smb error code %d to POSIX err %d !!",

		 smberrcode, rc));



	/* generic corrective action e.g. reconnect SMB session on ERRbaduid could be added */

	/* generic corrective action e.g. reconnect SMB session on 

	 * ERRbaduid could be added */



	return rc;

}

fs/cifs/readdir.c

+82 −81
Original line number Diff line number Diff line
@@ -526,8 +526,8 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level) 
			new_entry, end_of_smb, old_entry));

		return NULL;

	} else if (((level == SMB_FIND_FILE_INFO_STANDARD) &&

		   (new_entry + sizeof(FIND_FILE_STANDARD_INFO) > end_of_smb)) ||

		  ((level != SMB_FIND_FILE_INFO_STANDARD) &&

		    (new_entry + sizeof(FIND_FILE_STANDARD_INFO) > end_of_smb))

		  || ((level != SMB_FIND_FILE_INFO_STANDARD) &&

		   (new_entry + sizeof(FILE_DIRECTORY_INFO) > end_of_smb)))  {

		cERROR(1, ("search entry %p extends after end of SMB %p",

			new_entry, end_of_smb));
@@ -762,7 +762,7 @@ static int cifs_get_name_from_search_buf(struct qstr *pqst, 
			len = strnlen(filename, PATH_MAX);

		}



		/* BB fixme - hash low and high 32 bits if not 64 bit arch BB fixme */

		/* BB fixme - hash low and high 32 bits if not 64 bit arch BB */

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)

			*pinum = pFindData->UniqueId;

	} else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {
@@ -867,7 +867,8 @@ static int cifs_filldir(char *pfindEntry, struct file *file, 
	if (rc) {

		/* inode created, we need to hash it with right inode number */

		if (inum != 0) {

			/* BB fixme - hash the 2 32 quantities bits together if necessary BB */

			/* BB fixme - hash the 2 32 quantities bits together if

			 *  necessary BB */

			tmp_inode->i_ino = inum;

		}

		insert_inode_hash(tmp_inode);

fs/cifs/sess.c

+5 −4
Original line number Diff line number Diff line
@@ -468,7 +468,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, 


	/*	memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE);

		bcc_ptr += LM2_SESS_KEY_SIZE; */

		memcpy(bcc_ptr, (char *)v2_sess_key, sizeof(struct ntlmv2_resp));

		memcpy(bcc_ptr, (char *)v2_sess_key,

		       sizeof(struct ntlmv2_resp));

		bcc_ptr += sizeof(struct ntlmv2_resp);

		kfree(v2_sess_key);

		if (ses->capabilities & CAP_UNICODE) {

fs/cifs/smbdes.c

+12 −12

File changed.

Contains only whitespace changes.