diff options
author | Steve French <sfrench@us.ibm.com> | 2006-05-30 14:03:32 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-05-30 14:03:32 -0400 |
commit | fc94cdb94462e71a4a974bc9bc1f483189ae7805 (patch) | |
tree | 0a4695d80660bda29383d4285948f2302f52089a /fs/cifs/file.c | |
parent | d9ec5ad24ce80b7ef69a0717363db661d13aada5 (diff) |
[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) | |||
656 | else | 656 | else |
657 | posix_lock_type = CIFS_WRLCK; | 657 | posix_lock_type = CIFS_WRLCK; |
658 | rc = CIFSSMBPosixLock(xid, pTcon, netfid, 1 /* get */, | 658 | rc = CIFSSMBPosixLock(xid, pTcon, netfid, 1 /* get */, |
659 | length, pfLock->fl_start, | 659 | length, pfLock, |
660 | posix_lock_type, wait_flag); | 660 | posix_lock_type, wait_flag); |
661 | FreeXid(xid); | 661 | FreeXid(xid); |
662 | return rc; | 662 | return rc; |
@@ -704,7 +704,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) | |||
704 | return -EOPNOTSUPP; | 704 | return -EOPNOTSUPP; |
705 | } | 705 | } |
706 | rc = CIFSSMBPosixLock(xid, pTcon, netfid, 0 /* set */, | 706 | rc = CIFSSMBPosixLock(xid, pTcon, netfid, 0 /* set */, |
707 | length, pfLock->fl_start, | 707 | length, pfLock, |
708 | posix_lock_type, wait_flag); | 708 | posix_lock_type, wait_flag); |
709 | } else | 709 | } else |
710 | rc = CIFSSMBLock(xid, pTcon, netfid, length, pfLock->fl_start, | 710 | rc = CIFSSMBLock(xid, pTcon, netfid, length, pfLock->fl_start, |