diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /fs/cifs/file.c | |
| parent | [CIFS] Remove cifs_sb argument from *build_path_from_dentry (diff) | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| download | linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 026b5c5ccc89..ef455dda0473 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -650,7 +650,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) netfid, length, pfLock->fl_start, numUnlock, numLock, lockType, wait_flag); - if (rc == 0 && (pfLock->fl_flags & FL_POSIX)) + if (pfLock->fl_flags & FL_POSIX) posix_lock_file_wait(file, pfLock); FreeXid(xid); return rc; |