diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-05-26 13:00:56 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2013-06-24 08:56:40 +0200 |
| commit | 281e2e7d06c42ce8dfd423fa2ae5616af0e0323f (patch) | |
| tree | 78fdcb02c458429c3cc0260ffaba5e852057a332 /fs/cifs/smb1ops.c | |
| parent | cifs: throw a warning if negotiate or sess_setup ops are passed NULL server o... (diff) | |
| download | linux-281e2e7d06c42ce8dfd423fa2ae5616af0e0323f.tar.xz linux-281e2e7d06c42ce8dfd423fa2ae5616af0e0323f.zip | |
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/smb1ops.c')
| -rw-r--r-- | fs/cifs/smb1ops.c | 18 |
1 files changed, 6 insertions, 12 deletions
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"); |