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

Commit 75d3bce2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix reversed memset arguments
  Adds username in the upcall key for unattended mounts with keytab
  [CIFS] Remove redundant NULL check
parents a0abb93b 0a891adc

fs/cifs/cifs_spnego.c

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) 
	dp = description + strlen(description);

	sprintf(dp, ";uid=0x%x", sesInfo->linux_uid);



	dp = description + strlen(description);

	sprintf(dp, ";user=%s", sesInfo->userName);



	cFYI(1, ("key description = %s", description));

	spnego_key = request_key(&cifs_spnego_key_type, description, "");

fs/cifs/cifssmb.c

+6 −12
Original line number Diff line number Diff line
@@ -2159,7 +2159,6 @@ CIFSSMBCopy(const int xid, struct cifsTconInfo *tcon, const char *fromName, 
		cFYI(1, ("Send error in copy = %d with %d files copied",

			rc, le16_to_cpu(pSMBr->CopyCount)));

	}

	if (pSMB)

	cifs_buf_release(pSMB);



	if (rc == -EAGAIN)
@@ -2249,7 +2248,6 @@ CIFSUnixCreateSymLink(const int xid, struct cifsTconInfo *tcon, 
	if (rc)

		cFYI(1, ("Send error in SetPathInfo create symlink = %d", rc));



	if (pSMB)

	cifs_buf_release(pSMB);



	if (rc == -EAGAIN)
@@ -4095,7 +4093,6 @@ CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, 
				 target_nodes, nls_codepage);



GetDFSRefExit:

	if (pSMB)

	cifs_buf_release(pSMB);



	if (rc == -EAGAIN)
@@ -5117,7 +5114,6 @@ CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *tcon, 
	if (rc)

		cFYI(1, ("SetPathInfo (perms) returned %d", rc));



	if (pSMB)

	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto setPermsRetry;
@@ -5340,7 +5336,6 @@ CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, 
			}

		}

	}

	if (pSMB)

	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto QAllEAsRetry;
@@ -5490,7 +5485,6 @@ ssize_t CIFSSMBQueryEA(const int xid, struct cifsTconInfo *tcon, 
			}

		}

	}

	if (pSMB)

	cifs_buf_release(pSMB);

	if (rc == -EAGAIN)

		goto QEARetry;

fs/cifs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void fill_fake_finddataunix(FILE_UNIX_BASIC_INFO *pfnd_dat, 
{

	struct inode *pinode = NULL;



	memset(pfnd_dat, sizeof(FILE_UNIX_BASIC_INFO), 0);

	memset(pfnd_dat, 0, sizeof(FILE_UNIX_BASIC_INFO));



/*	__le64 pfnd_dat->EndOfFile = cpu_to_le64(0);

	__le64 pfnd_dat->NumOfBytes = cpu_to_le64(0);
@@ -384,7 +384,7 @@ static int get_sfu_mode(struct inode *inode, 
static void fill_fake_finddata(FILE_ALL_INFO *pfnd_dat,

			       struct super_block *sb)

{

	memset(pfnd_dat, sizeof(FILE_ALL_INFO), 0);

	memset(pfnd_dat, 0, sizeof(FILE_ALL_INFO));



/*	__le64 pfnd_dat->AllocationSize = cpu_to_le64(0);

	__le64 pfnd_dat->EndOfFile = cpu_to_le64(0);