[CIFS] more whitespace cleanup (790fe579) · Commits · e / devices / android_kernel_samsung_exynos5433

fs/cifs/cifsfs.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -119,7 +119,8 @@ cifs_read_super(struct super_block sb, void data,
		sb->s_export_op = &cifs_export_ops;
		#endif /* EXPERIMENTAL */
		/* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512)
		sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */
		sb->s_blocksize =
		cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */
		#ifdef CONFIG_CIFS_QUOTA
		sb->s_qcop = &cifs_quotactl_ops;
		#endif
		@@ -217,8 +218,7 @@ cifs_statfs(struct dentry dentry, struct kstatfs buf)
		bypassed it because we detected that this was an older LANMAN sess */
		if (rc)
		rc = SMBOldQFSInfo(xid, pTcon, buf);
		/*
		int f_type;
		/* int f_type;
		__fsid_t f_fsid;
		int f_namelen; */
		/* BB get from info in tcon struct at mount time call to QFSAttrInfo */

fs/cifs/cifssmb.c

+270 −270

Original line number	Diff line number	Diff line
		@@ -1433,7 +1433,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
		pSMB->OffsetLow = cpu_to_le32(offset & 0xFFFFFFFF);
		if (wct == 14)
		pSMB->OffsetHigh = cpu_to_le32(offset >> 32);
		else if((offset >> 32) > 0) /* can not handle this big offset for old */
		else if ((offset >> 32) > 0) /* can not handle big offset for old srv */
		return -EIO;

		pSMB->Reserved = 0xFFFFFFFF;
		@@ -1534,7 +1534,7 @@ CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon,
		pSMB->OffsetLow = cpu_to_le32(offset & 0xFFFFFFFF);
		if (wct == 14)
		pSMB->OffsetHigh = cpu_to_le32(offset >> 32);
		else if((offset >> 32) > 0) /* can not handle this big offset for old */
		else if ((offset >> 32) > 0) /* can not handle big offset for old srv */
		return -EIO;
		pSMB->Reserved = 0xFFFFFFFF;
		pSMB->WriteMode = 0;
		@@ -2954,7 +2954,6 @@ GetExtAttrOut:
		return rc;
		}


		#endif /* CONFIG_POSIX */


		@@ -3191,9 +3190,10 @@ QPathInfoRetry:
		else if (pFindData){
		int size;
		__u16 data_offset = le16_to_cpu(pSMBr->t2.DataOffset);
		if(legacy) /* we do not read the last field, EAsize, fortunately
		since it varies by subdialect and on Set vs. Get, is
		two bytes or 4 bytes depending but we don't care here */
		if (legacy) /* we do not read the last field, EAsize,
		fortunately since it varies by subdialect
		and on Set vs. Get, is two bytes or 4
		bytes depending but we don't care here */
		size = sizeof(FILE_INFO_STANDARD);
		else
		size = sizeof(FILE_ALL_INFO);
		@@ -5142,7 +5142,7 @@ QAllEAsRetry:
		struct fealist * ea_response_data;
		rc = 0;
		/* validate_trans2_offsets() */
		/* BB to check if(start of smb + data_offset > &bcc+ bcc)*/
		/* BB check if start of smb + data_offset > &bcc+ bcc */
		ea_response_data = (struct fealist *)
		(((char *) &pSMBr->hdr.Protocol) +
		data_offset);
		@@ -5285,7 +5285,7 @@ QEARetry:
		struct fealist * ea_response_data;
		rc = -ENODATA;
		/* validate_trans2_offsets() */
		/* BB to check if(start of smb + data_offset > &bcc+ bcc)*/
		/* BB check if start of smb + data_offset > &bcc+ bcc*/
		ea_response_data = (struct fealist *)
		(((char *) &pSMBr->hdr.Protocol) +
		data_offset);

fs/cifs/misc.c

+32 −32

Original line number	Diff line number	Diff line
		/*
		* fs/cifs/misc.c
		*
		* Copyright (C) International Business Machines Corp., 2002,2005
		* Copyright (C) International Business Machines Corp., 2002,2007
		* Author(s): Steve French (sfrench@us.ibm.com)
		*
		* This library is free software; you can redistribute it and/or modify

fs/cifs/readdir.c

+91 −88

Original line number	Diff line number	Diff line
		@@ -401,8 +401,9 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
		tmp_inode->i_data.a_ops = &cifs_addr_ops;

		if (isNewInode)
		return; /* No sense invalidating pages for new inode since we
		have not started caching readahead file data yet */
		return; /* No sense invalidating pages for new inode
		since we have not started caching readahead
		file data for it yet */

		if (timespec_equal(&tmp_inode->i_mtime, &local_mtime) &&
		(local_size == tmp_inode->i_size)) {
		@@ -583,7 +584,8 @@ static int cifs_entry_is_dot(char current_entry, struct cifsFileInfo cfile)
		filename = &pFindData->FileName[0];
		len = pFindData->FileNameLength;
		} else {
		cFYI(1,("Unknown findfirst level %d",cfile->srch_inf.info_level));
		cFYI(1, ("Unknown findfirst level %d",
		cfile->srch_inf.info_level));
		}

		if (filename) {
		@@ -681,7 +683,8 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
		}
		rc = initiate_cifs_search(xid,file);
		if (rc) {
		cFYI(1,("error %d reinitiating a search on rewind",rc));
		cFYI(1, ("error %d reinitiating a search on rewind",
		rc));
		return rc;
		}
		}
		@@ -728,7 +731,7 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
		}

		if (pos_in_buf >= cifsFile->srch_inf.entries_in_buffer) {
		cFYI(1,("can not return entries pos_in_buf beyond last entry"));
		cFYI(1, ("can not return entries pos_in_buf beyond last"));
		*num_to_ret = 0;
		} else
		*num_to_ret = cifsFile->srch_inf.entries_in_buffer - pos_in_buf;

fs/cifs/sess.c

+114 −111

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* SMB/CIFS session setup handling routines
		*
		* Copyright (c) International Business Machines Corp., 2006
		* Copyright (c) International Business Machines Corp., 2006, 2007
		* Author(s): Steve French (sfrench@us.ibm.com)
		*
		* This library is free software; you can redistribute it and/or modify
		@@ -51,7 +51,8 @@ static __u32 cifs_ssetup_hdr(struct cifsSesInfo ses, SESSION_SETUP_ANDX pSMB)
		capabilities = CAP_LARGE_FILES \| CAP_NT_SMBS \| CAP_LEVEL_II_OPLOCKS \|
		CAP_LARGE_WRITE_X \| CAP_LARGE_READ_X;

		if(ses->server->secMode & (SECMODE_SIGN_REQUIRED \| SECMODE_SIGN_ENABLED))
		if (ses->server->secMode &
		(SECMODE_SIGN_REQUIRED \| SECMODE_SIGN_ENABLED))
		pSMB->req.hdr.Flags2 \|= SMBFLG2_SECURITY_SIGNATURE;

		if (ses->capabilities & CAP_UNICODE) {
		@@ -170,7 +171,8 @@ static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses,
		*pbcc_area = bcc_ptr;
		}

		static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,
		static int decode_unicode_ssetup(char **pbcc_area, int bleft,
		struct cifsSesInfo *ses,
		const struct nls_table *nls_cp)
		{
		int rc = 0;
		@@ -255,7 +257,8 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInf
		return rc;
		}

		static int decode_ascii_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfo *ses,
		static int decode_ascii_ssetup(char **pbcc_area, int bleft,
		struct cifsSesInfo *ses,
		const struct nls_table *nls_cp)
		{
		int rc = 0;
		@@ -347,7 +350,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
		} else if ((type == NTLM) \|\| (type == NTLMv2)) {
		/* For NTLMv2 failures eventually may need to retry NTLM */
		wct = 13; /* old style NTLM sessionsetup */
		} else /* same size for negotiate or auth, NTLMSSP or extended security */
		} else /* same size: negotiate or auth, NTLMSSP or extended security */
		wct = 12;

		rc = small_smb_init_no_tc(SMB_COM_SESSION_SETUP_ANDX, wct, ses,