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/smb1ops.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/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, | |||
765 | } | 765 | } |
766 | tcon = tlink_tcon(tlink); | 766 | tcon = tlink_tcon(tlink); |
767 | 767 | ||
768 | /* | 768 | rc = CIFSSMBSetPathInfo(xid, tcon, full_path, buf, cifs_sb->local_nls, |
769 | * NT4 apparently returns success on this call, but it doesn't really | ||
770 | * work. | ||
771 | */ | ||
772 | if (!(tcon->ses->flags & CIFS_SES_NT4)) { | ||
773 | rc = CIFSSMBSetPathInfo(xid, tcon, full_path, buf, | ||
774 | cifs_sb->local_nls, | ||
775 | cifs_sb->mnt_cifs_flags & | 769 | cifs_sb->mnt_cifs_flags & |
776 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 770 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
777 | if (rc == 0) { | 771 | if (rc == 0) { |
778 | cinode->cifsAttrs = le32_to_cpu(buf->Attributes); | 772 | cinode->cifsAttrs = le32_to_cpu(buf->Attributes); |
779 | goto out; | 773 | goto out; |
780 | } else if (rc != -EOPNOTSUPP && rc != -EINVAL) | 774 | } else if (rc != -EOPNOTSUPP && rc != -EINVAL) { |
781 | goto out; | 775 | goto out; |
782 | } | 776 | } |
783 | 777 | ||
784 | cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n"); | 778 | cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n"); |