From 508c09c6a019458bb0290fbf284e73c24feddb0e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 25 Jun 2014 17:10:45 -0700 Subject: 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 Reviewed-by: Ira Cooper Reviewed-by: Volker Lendecke --- source3/smbd/smb2_lock.c | 13 ------------- 1 file changed, 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); - } } /**************************************************************** -- cgit