Skip to content

Commit

Permalink
CIFS: Fix the VFS brlock cache usage in posix locking case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pavel Shilovsky authored and Steve French committed Oct 30, 2011
1 parent 8ea00c6 commit 5079276
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions fs/cifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down

0 comments on commit 5079276

Please sign in to comment.