4 files changed, 7 insertions, 29 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 29dd1113e40d..be993ec5895b 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -692,7 +692,6 @@ struct cifs_ses {
         enum statusEnum status;
         unsigned overrideSecFlg;  /* if non-zero override global sec flags */
         __u16 ipc_tid;          /* special tid for connection to IPC share */
-        __u16 flags;
         __u16 vcnum;
         char *serverOS;         /* name of operating system underlying server */
         char *serverNOS;        /* name of network operating system of server */
@@ -715,15 +714,6 @@ struct cifs_ses {
 #endif /* CONFIG_CIFS_SMB2 */
 };
 
-/* no more than one of the following three session flags may be set */
-#define CIFS_SES_NT4 1
-#define CIFS_SES_OS2 2
-#define CIFS_SES_W9X 4
-/* following flag is set for old servers such as OS2 (and Win95?)
-   which do not negotiate NTLM or POSIX dialects, but instead
-   negotiate one of the older LANMAN dialects */
-#define CIFS_SES_LANMAN 8
-
 static inline bool
 cap_unix(struct cifs_ses *ses)
 {
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 180d9b95fab0..160134902233 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3834,7 +3834,6 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,
         int rc = -ENOSYS;
         struct TCP_Server_Info *server = ses->server;
 
-        ses->flags = 0;
         ses->capabilities = server->capabilities;
         if (linuxExtEnabled == 0)
                 ses->capabilities &= (~server->vals->cap_unix);
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,
         ses->serverOS = kzalloc(len + 1, GFP_KERNEL);
         if (ses->serverOS)
                 strncpy(ses->serverOS, bcc_ptr, len);
-        if (strncmp(ses->serverOS, "OS/2", 4) == 0) {
+        if (strncmp(ses->serverOS, "OS/2", 4) == 0)
                 cifs_dbg(FYI, "OS/2 server\n");
-                        ses->flags |= CIFS_SES_OS2;
-        }
 
         bcc_ptr += len + 1;
         bleft -= len + 1;
@@ -642,8 +640,6 @@ ssetup_ntlmssp_authenticate:
         }
         bcc_ptr = str_area;
 
-        ses->flags &= ~CIFS_SES_LANMAN;
-
         iov[1].iov_base = NULL;
         iov[1].iov_len = 0;
 
@@ -667,7 +663,6 @@ ssetup_ntlmssp_authenticate:
                                  ses->server->sec_mode & SECMODE_PW_ENCRYPT ?
                                         true : false, lnm_session_key);
 
-                ses->flags |= CIFS_SES_LANMAN;
                 memcpy(bcc_ptr, (char *)lnm_session_key, CIFS_AUTH_RESP_SIZE);
                 bcc_ptr += CIFS_AUTH_RESP_SIZE;
 
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 3efdb9d5c0b8..7d1c78bce4ae 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -765,20 +765,14 @@ smb_set_file_info(struct inode *inode, const char *full_path,
         }
         tcon = tlink_tcon(tlink);
 
-        /*
-         * NT4 apparently returns success on this call, but it doesn't really
-         * work.
-         */
-        if (!(tcon->ses->flags & CIFS_SES_NT4)) {
-                rc = CIFSSMBSetPathInfo(xid, tcon, full_path, buf,
-                                        cifs_sb->local_nls,
+        rc = CIFSSMBSetPathInfo(xid, tcon, full_path, buf, cifs_sb->local_nls,
                                         cifs_sb->mnt_cifs_flags &
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
-                if (rc == 0) {
-                        cinode->cifsAttrs = le32_to_cpu(buf->Attributes);
-                        goto out;
-                } else if (rc != -EOPNOTSUPP && rc != -EINVAL)
-                        goto out;
+        if (rc == 0) {
+                cinode->cifsAttrs = le32_to_cpu(buf->Attributes);
+                goto out;
+        } else if (rc != -EOPNOTSUPP && rc != -EINVAL) {
+                goto out;
         }
 
         cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n");