Revert "[CIFS] Eliminate unused variable warning" (7100ae97) · Commits · 戴 / test

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 . Signed-off-by:

Steve French <sfrench@us.ibm.com> Acked-by:

Jeff Layton <jlayton@redhat.com> CC: Shirish Pargaonkar <shirishp@us.ibm.com>

fs/cifs/sess.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message