[CIFS] Do not time out posix brl requests when using new posix setfileinfo

request and do not time out slow requests to a server that is still responding
well to other threads

Suggested by jra of Samba team

Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 89b57148115479eef074b8d3f86c4c86c96ac969 commit)

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 944d2b9e092d..52e2e4c8794b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -644,8 +644,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
         account for negative length which we can not accept over the
         wire */
         if (IS_GETLK(cmd)) {
-                if(experimEnabled && 
-                   (cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
+                if((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
                    (CIFS_UNIX_FCNTL_CAP & 
                         le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) {
                         int posix_lock_type;
@@ -683,8 +682,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
                 FreeXid(xid);
                 return rc;
         }
-        if (experimEnabled &&
-                (cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
+        if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&
                 (CIFS_UNIX_FCNTL_CAP &
                          le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) {
                 int posix_lock_type;