lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "[CIFS] Eliminate unused variable warning"

Browse Source 
The change to kernel crypto and fixes to ntlvm2 and ntlmssp
series, introduced a regression.  Deferring this patch series
to 2.6.37 after Shirish fixes it.

This reverts commit c89e5198b2.

Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
This commit is contained in:
Steve French
2010-09-08 20:54:49 +00:00
parent d56557af19
commit 7100ae9726
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/cifs/sess.c
View File

@@ -620,6 +620,7 @@ 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;
@@ -867,8 +868,6 @@ ssetup_ntlmssp_authenticate:
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);