Skip to content

Commit

Permalink
Revert "[CIFS] Eliminate unused variable warning"
Browse files Browse the repository at this point in the history
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 c89e519.

Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
  • Loading branch information
Steve French committed Sep 8, 2010
1 parent d56557a commit 7100ae9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions fs/cifs/sess.c
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ 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;
Expand Down Expand Up @@ -867,8 +868,6 @@ 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);
Expand Down

0 comments on commit 7100ae9

Please sign in to comment.