summaryrefslogtreecommitdiffstats
path: root/source3/smbd/smb2_lock.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-07-03 10:06:56 +0000
committerJeremy Allison <jra@samba.org>2014-07-04 06:31:16 +0200
commitf93ae07679877834a27fbcb936b49efd59c6b0c2 (patch)
tree3ba8856f7897bc542830d76e0e1283bb3c402092 /source3/smbd/smb2_lock.c
parent27ef39577153bcfe7e7072383657422666f93dbd (diff)
downloadsamba-f93ae07679877834a27fbcb936b49efd59c6b0c2.tar.gz
samba-f93ae07679877834a27fbcb936b49efd59c6b0c2.tar.xz
samba-f93ae07679877834a27fbcb936b49efd59c6b0c2.zip
smbd: Factor out unlocking from smbd_do_locking
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd/smb2_lock.c')
-rw-r--r--source3/smbd/smb2_lock.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index c25e0642f5..9aadd00e89 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -328,20 +328,13 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
state->lock_count = in_lock_count;
if (isunlock) {
- status = smbd_do_locking(smb1req, fsp,
- 0,
- timeout,
- in_lock_count,
- locks,
- 0,
- NULL,
- &async);
+ status = smbd_do_unlocking(smb1req, fsp,
+ in_lock_count, locks);
+ async = false;
} else {
status = smbd_do_locking(smb1req, fsp,
0,
timeout,
- 0,
- NULL,
in_lock_count,
locks,
&async);