diff options
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 6 |
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) | |||
644 | account for negative length which we can not accept over the | 644 | account for negative length which we can not accept over the |
645 | wire */ | 645 | wire */ |
646 | if (IS_GETLK(cmd)) { | 646 | if (IS_GETLK(cmd)) { |
647 | if(experimEnabled && | 647 | if((cifs_sb->tcon->ses->capabilities & CAP_UNIX) && |
648 | (cifs_sb->tcon->ses->capabilities & CAP_UNIX) && | ||
649 | (CIFS_UNIX_FCNTL_CAP & | 648 | (CIFS_UNIX_FCNTL_CAP & |
650 | le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { | 649 | le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { |
651 | int posix_lock_type; | 650 | int posix_lock_type; |
@@ -683,8 +682,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) | |||
683 | FreeXid(xid); | 682 | FreeXid(xid); |
684 | return rc; | 683 | return rc; |
685 | } | 684 | } |
686 | if (experimEnabled && | 685 | if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) && |
687 | (cifs_sb->tcon->ses->capabilities & CAP_UNIX) && | ||
688 | (CIFS_UNIX_FCNTL_CAP & | 686 | (CIFS_UNIX_FCNTL_CAP & |
689 | le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { | 687 | le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { |
690 | int posix_lock_type; | 688 | int posix_lock_type; |