diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-05-30 20:03:32 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-05-30 20:03:32 +0200 |
| commit | fc94cdb94462e71a4a974bc9bc1f483189ae7805 (patch) | |
| tree | 0a4695d80660bda29383d4285948f2302f52089a /fs/cifs/file.c | |
| parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-fc94cdb94462e71a4a974bc9bc1f483189ae7805.tar.xz linux-fc94cdb94462e71a4a974bc9bc1f483189ae7805.zip | |
[CIFS] Fix new POSIX Locking for setting lock_type correctly on unlock
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index e152bf6afa60..7ef30efe8f98 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -656,7 +656,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) else posix_lock_type = CIFS_WRLCK; rc = CIFSSMBPosixLock(xid, pTcon, netfid, 1 /* get */, - length, pfLock->fl_start, + length, pfLock, posix_lock_type, wait_flag); FreeXid(xid); return rc; @@ -704,7 +704,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) return -EOPNOTSUPP; } rc = CIFSSMBPosixLock(xid, pTcon, netfid, 0 /* set */, - length, pfLock->fl_start, + length, pfLock, posix_lock_type, wait_flag); } else rc = CIFSSMBLock(xid, pTcon, netfid, length, pfLock->fl_start, |