1 files changed, 26 insertions, 27 deletions

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 3efdb9d5c0b8..60943978aec3 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -449,8 +449,7 @@ cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *volume_info)
          * WRITEX header, not including the 4 byte RFC1001 length.
          */
         if (!(server->capabilities & CAP_LARGE_WRITE_X) ||
-            (!(server->capabilities & CAP_UNIX) &&
-             (server->sec_mode & (SECMODE_SIGN_ENABLED|SECMODE_SIGN_REQUIRED))))
+            (!(server->capabilities & CAP_UNIX) && server->sign))
                 wsize = min_t(unsigned int, wsize,
                                 server->maxBuf - sizeof(WRITE_REQ) + 4);
 
@@ -675,20 +674,23 @@ cifs_mkdir_setinfo(struct inode *inode, const char *full_path,
 }
 
 static int
-cifs_open_file(const unsigned int xid, struct cifs_tcon *tcon, const char *path,
-               int disposition, int desired_access, int create_options,
-               struct cifs_fid *fid, __u32 *oplock, FILE_ALL_INFO *buf,
-               struct cifs_sb_info *cifs_sb)
-{
-        if (!(tcon->ses->capabilities & CAP_NT_SMBS))
-                return SMBLegacyOpen(xid, tcon, path, disposition,
-                                     desired_access, create_options,
-                                     &fid->netfid, oplock, buf,
-                                     cifs_sb->local_nls, cifs_sb->mnt_cifs_flags
+cifs_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
+               __u32 *oplock, FILE_ALL_INFO *buf)
+{
+        if (!(oparms->tcon->ses->capabilities & CAP_NT_SMBS))
+                return SMBLegacyOpen(xid, oparms->tcon, oparms->path,
+                                     oparms->disposition,
+                                     oparms->desired_access,
+                                     oparms->create_options,
+                                     &oparms->fid->netfid, oplock, buf,
+                                     oparms->cifs_sb->local_nls,
+                                     oparms->cifs_sb->mnt_cifs_flags
                                                 & CIFS_MOUNT_MAP_SPECIAL_CHR);
-        return CIFSSMBOpen(xid, tcon, path, disposition, desired_access,
-                           create_options, &fid->netfid, oplock, buf,
-                           cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
+        return CIFSSMBOpen(xid, oparms->tcon, oparms->path,
+                           oparms->disposition, oparms->desired_access,
+                           oparms->create_options, &oparms->fid->netfid, oplock,
+                           buf, oparms->cifs_sb->local_nls,
+                           oparms->cifs_sb->mnt_cifs_flags &
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
 }
 
@@ -765,20 +767,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");
@@ -948,6 +944,7 @@ struct smb_version_operations smb1_operations = {
         .mand_lock = cifs_mand_lock,
         .mand_unlock_range = cifs_unlock_range,
         .push_mand_locks = cifs_push_mandatory_locks,
+        .query_mf_symlink = open_query_close_cifs_symlink,
 };
 
 struct smb_version_values smb1_values = {
@@ -964,4 +961,6 @@ struct smb_version_values smb1_values = {
         .cap_nt_find = CAP_NT_SMBS | CAP_NT_FIND,
         .cap_large_files = CAP_LARGE_FILES,
         .oplock_read = OPLOCK_READ,
+        .signing_enabled = SECMODE_SIGN_ENABLED,
+        .signing_required = SECMODE_SIGN_REQUIRED,
 };