diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-02 03:24:57 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-02 03:24:57 +0000 |
| commit | 82940a465829b0c757dea45889aa150c8083e3d9 (patch) | |
| tree | 3ef3b38f47d93f07b6b5ebc51a54f301f62ec11a /fs/cifs/file.c | |
| parent | 46c79a645a00e71dbbfd5f52abe0ea7cf2d5daa3 (diff) | |
[CIFS] Make POSIX CIFS Extensions SetFSInfo match exactly what we want
not just the posix path feature.
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index bd135c4e495..71a30fd76aa 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -649,7 +649,9 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) wire */ if (IS_GETLK(cmd)) { if(experimEnabled && - (cifs_sb->tcon->ses->capabilities & CAP_UNIX)) { + (cifs_sb->tcon->ses->capabilities & CAP_UNIX) && + (CIFS_UNIX_FCNTL_CAP & + le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { int posix_lock_type; if(lockType & LOCKING_ANDX_SHARED_LOCK) posix_lock_type = CIFS_RDLCK; @@ -686,7 +688,9 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) return rc; } if (experimEnabled && - (cifs_sb->tcon->ses->capabilities & CAP_UNIX)) { + (cifs_sb->tcon->ses->capabilities & CAP_UNIX) && + (CIFS_UNIX_FCNTL_CAP & + le64_to_cpu(cifs_sb->tcon->fsUnixInfo.Capability))) { int posix_lock_type; if(lockType & LOCKING_ANDX_SHARED_LOCK) posix_lock_type = CIFS_RDLCK; |