Skip to content

Commit

Permalink
cifs: remove the cifs_ses->flags field
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Layton authored and Steve French committed Jun 24, 2013
1 parent 3534b85 commit 281e2e7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 29 deletions.
10 changes: 0 additions & 10 deletions fs/cifs/cifsglob.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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)
{
Expand Down
1 change: 0 additions & 1 deletion fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 1 addition & 6 deletions fs/cifs/sess.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -642,8 +640,6 @@ CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,
}
bcc_ptr = str_area;

ses->flags &= ~CIFS_SES_LANMAN;

iov[1].iov_base = NULL;
iov[1].iov_len = 0;

Expand All @@ -667,7 +663,6 @@ CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,
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;

Expand Down
18 changes: 6 additions & 12 deletions fs/cifs/smb1ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 281e2e7

Please sign in to comment.