summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2014-06-25 17:10:45 -0700
committerVolker Lendecke <vl@samba.org>2014-06-30 12:41:10 +0200
commit508c09c6a019458bb0290fbf284e73c24feddb0e (patch)
tree8dc0bf28d103e0ccaf9261686738b6a60b063483
parentb2a74726ee9eedd688ff0443bc292bb59f81ba5c (diff)
downloadsamba-508c09c6a019458bb0290fbf284e73c24feddb0e.tar.gz
samba-508c09c6a019458bb0290fbf284e73c24feddb0e.tar.xz
samba-508c09c6a019458bb0290fbf284e73c24feddb0e.zip
s3: smb2: Remove unused code from remove_pending_lock().
SMB2 blocking locks can only have one lock per request, so there can never be any previous locks to remove. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ira Cooper <ira@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
-rw-r--r--source3/smbd/smb2_lock.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 5da14e9c2d..1236f4feea 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -664,19 +664,6 @@ static void remove_pending_lock(struct smbd_smb2_lock_state *state,
blr);
TALLOC_FREE(br_lck);
}
-
- /* Remove the locks we already got. */
-
- for(i = blr->lock_num - 1; i >= 0; i--) {
- struct smbd_lock_element *e = &state->locks[i];
-
- do_unlock(blr->fsp->conn->sconn->msg_ctx,
- blr->fsp,
- e->smblctx,
- e->count,
- e->offset,
- WINDOWS_LOCK);
- }
}
/****************************************************************