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>

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 795095f4eac69ba204257a597522e465dafac371..4788e16a02cc91a59cfe3b4721d19c867e97b96c 100644 (file)
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -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;
@@ -867,8 +868,6 @@ ssetup_ntlmssp_authenticate:
                                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);