Commit 7be0d4f9 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:
  Cannot allocate memory error on mount
  [CIFS] Eliminate unused variable warning
parents 62b88dc1 f0138a79

fs/cifs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino) 
						xid, NULL);



	if (!inode)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(rc);



#ifdef CONFIG_CIFS_FSCACHE

	/* populate tcon->resource_id */

fs/cifs/sess.c

+2 −1
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, 
	struct key *spnego_key = NULL;

	__le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */

	bool first_time;

	char *ntlmsspblob;



	if (ses == NULL)

		return -EINVAL;
@@ -868,6 +867,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, 
				iov[1].iov_base = &pSMB->req.SecurityBlob[0];

			} else if (phase == NtLmAuthenticate) {

				int blob_len;

				char *ntlmsspblob;



				ntlmsspblob = kmalloc(5 *

					sizeof(struct _AUTHENTICATE_MESSAGE),

					GFP_KERNEL);