Commit 7be0d4f9 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -834,7 +834,7 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino) ...@@ -834,7 +834,7 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino)
xid, NULL); xid, NULL);
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(rc);
#ifdef CONFIG_CIFS_FSCACHE #ifdef CONFIG_CIFS_FSCACHE
/* populate tcon->resource_id */ /* populate tcon->resource_id */
......
...@@ -620,7 +620,6 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, ...@@ -620,7 +620,6 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
struct key *spnego_key = NULL; struct key *spnego_key = NULL;
__le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */ __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */
bool first_time; bool first_time;
char *ntlmsspblob;
if (ses == NULL) if (ses == NULL)
return -EINVAL; return -EINVAL;
...@@ -868,6 +867,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, ...@@ -868,6 +867,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
iov[1].iov_base = &pSMB->req.SecurityBlob[0]; iov[1].iov_base = &pSMB->req.SecurityBlob[0];
} else if (phase == NtLmAuthenticate) { } else if (phase == NtLmAuthenticate) {
int blob_len; int blob_len;
char *ntlmsspblob;
ntlmsspblob = kmalloc(5 * ntlmsspblob = kmalloc(5 *
sizeof(struct _AUTHENTICATE_MESSAGE), sizeof(struct _AUTHENTICATE_MESSAGE),
GFP_KERNEL); GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment