diff options
author | Jeff Layton <jlayton@redhat.com> | 2013-05-26 07:00:56 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2013-06-24 02:56:40 -0400 |
commit | 281e2e7d06c42ce8dfd423fa2ae5616af0e0323f (patch) | |
tree | 78fdcb02c458429c3cc0260ffaba5e852057a332 /fs/cifs/sess.c | |
parent | 3534b8508e4b21eec0b7b839f7234a9b6fe27d03 (diff) |
cifs: remove the cifs_ses->flags field
This field is completely unused:
CIFS_SES_W9X is completely unused. CIFS_SES_LANMAN and CIFS_SES_OS2
are set but never checked. CIFS_SES_NT4 is checked, but never set.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index e8c5dc9f3386..0d0fe38f66a2 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -328,10 +328,8 @@ static void decode_ascii_ssetup(char **pbcc_area, __u16 bleft, | |||
328 | ses->serverOS = kzalloc(len + 1, GFP_KERNEL); | 328 | ses->serverOS = kzalloc(len + 1, GFP_KERNEL); |
329 | if (ses->serverOS) | 329 | if (ses->serverOS) |
330 | strncpy(ses->serverOS, bcc_ptr, len); | 330 | strncpy(ses->serverOS, bcc_ptr, len); |
331 | if (strncmp(ses->serverOS, "OS/2", 4) == 0) { | 331 | if (strncmp(ses->serverOS, "OS/2", 4) == 0) |
332 | cifs_dbg(FYI, "OS/2 server\n"); | 332 | cifs_dbg(FYI, "OS/2 server\n"); |
333 | ses->flags |= CIFS_SES_OS2; | ||
334 | } | ||
335 | 333 | ||
336 | bcc_ptr += len + 1; | 334 | bcc_ptr += len + 1; |
337 | bleft -= len + 1; | 335 | bleft -= len + 1; |
@@ -642,8 +640,6 @@ ssetup_ntlmssp_authenticate: | |||
642 | } | 640 | } |
643 | bcc_ptr = str_area; | 641 | bcc_ptr = str_area; |
644 | 642 | ||
645 | ses->flags &= ~CIFS_SES_LANMAN; | ||
646 | |||
647 | iov[1].iov_base = NULL; | 643 | iov[1].iov_base = NULL; |
648 | iov[1].iov_len = 0; | 644 | iov[1].iov_len = 0; |
649 | 645 | ||
@@ -667,7 +663,6 @@ ssetup_ntlmssp_authenticate: | |||
667 | ses->server->sec_mode & SECMODE_PW_ENCRYPT ? | 663 | ses->server->sec_mode & SECMODE_PW_ENCRYPT ? |
668 | true : false, lnm_session_key); | 664 | true : false, lnm_session_key); |
669 | 665 | ||
670 | ses->flags |= CIFS_SES_LANMAN; | ||
671 | memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_AUTH_RESP_SIZE); | 666 | memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_AUTH_RESP_SIZE); |
672 | bcc_ptr += CIFS_AUTH_RESP_SIZE; | 667 | bcc_ptr += CIFS_AUTH_RESP_SIZE; |
673 | 668 | ||