diff options
| author |   Pavel Shilovsky <piastry@etersoft.ru> | 2011-10-29 17:17:57 +0400 |
|---|---|---|
| committer |   Steve French <smfrench@gmail.com> | 2011-10-29 22:03:14 -0500 |
| commit | 5079276066cc421b48a6a63a54a34775979e8506 (patch) | |
| tree | e24d9df48c301023532945a67b476bedf4d27a36 /fs/cifs | |
| parent | [CIFS] Update cifs version to 1.76 (diff) | |
| download | linux-dev-5079276066cc421b48a6a63a54a34775979e8506.tar.xz linux-dev-5079276066cc421b48a6a63a54a34775979e8506.zip | |
CIFS: Fix the VFS brlock cache usage in posix locking case
Request to the cache in FL_POSIX case only.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/file.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 91e05f2f0acf..c1f063cd1b0c 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -793,6 +793,9 @@ cifs_posix_lock_test(struct file *file, struct file_lock *flock) struct cifsInodeInfo *cinode = CIFS_I(file->f_path.dentry->d_inode); unsigned char saved_type = flock->fl_type; + if ((flock->fl_flags & FL_POSIX) == 0) + return 1; + mutex_lock(&cinode->lock_mutex); posix_test_lock(file, flock); @@ -809,12 +812,15 @@ static int cifs_posix_lock_set(struct file *file, struct file_lock *flock) { struct cifsInodeInfo *cinode = CIFS_I(file->f_path.dentry->d_inode); - int rc; + int rc = 1; + + if ((flock->fl_flags & FL_POSIX) == 0) + return rc; mutex_lock(&cinode->lock_mutex); if (!cinode->can_cache_brlcks) { mutex_unlock(&cinode->lock_mutex); - return 1; + return rc; } rc = posix_lock_file_wait(file, flock); mutex_unlock(&cinode->lock_mutex); |