[CIFS] various minor cleanups pointed out by checkpatch script (61e74801) · Commits · e / devices / android_kernel_sony_msm8994

fs/cifs/AUTHORS

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,7 +36,9 @@ Miklos Szeredi
		Kazeon team for various fixes especially for 2.4 version.
		Asser Ferno (Change Notify support)
		Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup
		Gunter Kukkukk (testing and suggestions for support of old servers)
		Igor Mammedov (DFS support)
		Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code)

		Test case and Bug Report contributors
		-------------------------------------

+7 −12

Original line number	Diff line number	Diff line
		@@ -347,7 +347,6 @@ cifs_show_options(struct seq_file s, struct vfsmount m)
		if (cifs_sb) {
		tcon = cifs_sb->tcon;
		if (tcon) {
		/* BB add prepath to mount options displayed */
		seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName);
		if (tcon->ses) {
		if (tcon->ses->userName)
		@@ -439,9 +438,8 @@ int cifs_xquota_set(struct super_block *sb, int quota_type, qid_t qid,
		xid = GetXid();
		if (pTcon) {
		cFYI(1, ("set type: 0x%x id: %d", quota_type, qid));
		} else {
		} else
		rc = -EIO;
		}

		FreeXid(xid);
		return rc;
		@@ -463,9 +461,8 @@ int cifs_xquota_get(struct super_block *sb, int quota_type, qid_t qid,
		xid = GetXid();
		if (pTcon) {
		cFYI(1, ("set type: 0x%x id: %d", quota_type, qid));
		} else {
		} else
		rc = -EIO;
		}

		FreeXid(xid);
		return rc;
		@@ -486,9 +483,8 @@ int cifs_xstate_set(struct super_block *sb, unsigned int flags, int operation)
		xid = GetXid();
		if (pTcon) {
		cFYI(1, ("flags: 0x%x operation: 0x%x", flags, operation));
		} else {
		} else
		rc = -EIO;
		}

		FreeXid(xid);
		return rc;
		@@ -501,17 +497,16 @@ int cifs_xstate_get(struct super_block sb, struct fs_quota_stat qstats)
		struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
		struct cifsTconInfo *pTcon;

		if (cifs_sb) {
		if (cifs_sb)
		pTcon = cifs_sb->tcon;
		} else {
		else
		return -EIO;
		}

		xid = GetXid();
		if (pTcon) {
		cFYI(1, ("pqstats %p", qstats));
		} else {
		} else
		rc = -EIO;
		}

		FreeXid(xid);
		return rc;

+7 −11

Original line number	Diff line number	Diff line
		@@ -2728,13 +2728,11 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
		len));
		}
		} else {
		cERROR(1,
		(" Security Blob Length extends beyond "
		cERROR(1, ("Security Blob Length extends beyond "
		"end of SMB"));
		}
		} else {
		cERROR(1,
		(" Invalid Word count %d: ",
		cERROR(1, ("Invalid Word count %d: ",
		smb_buffer_response->WordCount));
		rc = -EIO;
		}
		@@ -2900,8 +2898,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,

		SecurityBlob2 = (PCHALLENGE_MESSAGE) bcc_ptr;
		if (SecurityBlob2->MessageType != NtLmChallenge) {
		cFYI(1,
		("Unexpected NTLMSSP message type received %d",
		cFYI(1, ("Unexpected NTLMSSP message type received %d",
		SecurityBlob2->MessageType));
		} else if (ses) {
		ses->Suid = smb_buffer_response->Uid; /* UID left in le format */
		@@ -3073,8 +3070,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
		cERROR(1, ("No session structure passed in."));
		}
		} else {
		cERROR(1,
		(" Invalid Word count %d:",
		cERROR(1, ("Invalid Word count %d:",
		smb_buffer_response->WordCount));
		rc = -EIO;
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -519,8 +519,7 @@ cifs_lookup(struct inode parent_dir_inode, struct dentry direntry,
		} else {
		cFYI(1, ("NULL inode in lookup"));
		}
		cFYI(1,
		(" Full path: %s inode = 0x%p", full_path, direntry->d_inode));
		cFYI(1, ("Full path: %s inode = 0x%p", full_path, direntry->d_inode));

		if (pTcon->unix_ext)
		rc = cifs_get_inode_info_unix(&newInode, full_path,

+1 −1

File changed.

Contains only whitespace changes.

+8 −8

File changed.

Contains only whitespace changes.