aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2010-09-08 16:54:49 -0400
committerSteve French <sfrench@us.ibm.com>2010-09-08 16:54:49 -0400
commit7100ae97266e387d25d0c8a5d9934931f0b07dbc (patch)
treef4280ef000936b8ddb3fad2494e7ac359a91dd0c /fs
parentd56557af19867edb8c0e96f8e26399698a08857f (diff)
Revert "[CIFS] Eliminate unused variable warning"
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 c89e5198b26a869ce2842bad8519264f3394dee9. Signed-off-by: Steve French <sfrench@us.ibm.com> Acked-by: Jeff Layton <jlayton@redhat.com> CC: Shirish Pargaonkar <shirishp@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/sess.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 795095f4eac6..4788e16a02cc 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -620,6 +620,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
620 struct key *spnego_key = NULL; 620 struct key *spnego_key = NULL;
621 __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */ 621 __le32 phase = NtLmNegotiate; /* NTLMSSP, if needed, is multistage */
622 bool first_time; 622 bool first_time;
623 char *ntlmsspblob;
623 624
624 if (ses == NULL) 625 if (ses == NULL)
625 return -EINVAL; 626 return -EINVAL;
@@ -867,8 +868,6 @@ ssetup_ntlmssp_authenticate:
867 iov[1].iov_base = &pSMB->req.SecurityBlob[0]; 868 iov[1].iov_base = &pSMB->req.SecurityBlob[0];
868 } else if (phase == NtLmAuthenticate) { 869 } else if (phase == NtLmAuthenticate) {
869 int blob_len; 870 int blob_len;
870 char *ntlmsspblob;
871
872 ntlmsspblob = kmalloc(5 * 871 ntlmsspblob = kmalloc(5 *
873 sizeof(struct _AUTHENTICATE_MESSAGE), 872 sizeof(struct _AUTHENTICATE_MESSAGE),
874 GFP_KERNEL); 873 GFP_KERNEL);