diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /fs/cifs | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/cifs')
| -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) | |||
| 650 | netfid, length, | 650 | netfid, length, |
| 651 | pfLock->fl_start, numUnlock, numLock, lockType, | 651 | pfLock->fl_start, numUnlock, numLock, lockType, |
| 652 | wait_flag); | 652 | wait_flag); |
| 653 | if (rc == 0 && (pfLock->fl_flags & FL_POSIX)) | 653 | if (pfLock->fl_flags & FL_POSIX) |
| 654 | posix_lock_file_wait(file, pfLock); | 654 | posix_lock_file_wait(file, pfLock); |
| 655 | FreeXid(xid); | 655 | FreeXid(xid); |
| 656 | return rc; | 656 | return rc; |