summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2014-06-25 17:10:45 -0700
committerKarolin Seeger <kseeger@samba.org>2014-07-19 03:00:07 +0200
commitead305e1ad0ea57dec62075905e97475378b40b9 (patch)
treef28a60f9ac156deb7ee2f0aef38ef1de1faa4fad
parent4c32263756ae08cfafd3ec8e8fc8ef416227d4aa (diff)
downloadsamba-ead305e1ad0ea57dec62075905e97475378b40b9.tar.gz
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> (cherry picked from commit 508c09c6a019458bb0290fbf284e73c24feddb0e)
-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 2ee7afa5d69..ba61eba381c 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);
- }
}
/****************************************************************