summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2014-06-26 12:08:46 -0700
committerKarolin Seeger <kseeger@samba.org>2014-07-19 03:00:07 +0200
commit6526cb7a94a12bf911c58072debb7aec69975dd0 (patch)
tree4f53a2c889b4f61cb1b57c0928a56aa418b9daaa
parent8fa384d0bd25635ed0c7953a6efc380ba391ebaa (diff)
downloadsamba-6526cb7a94a12bf911c58072debb7aec69975dd0.tar.gz
s3: SMB2 : Fix leak of blocking lock records in the database.
Based on a fix from Hemanth Thummala <hemanth.thummala@gmail.com> Bug #10673 - Increasing response times for byte range unlock requests. The previous refactoring makes it obvious we need to call remove_pending_lock() in all places where we are returning from the SMB2 blocking lock call. https://bugzilla.samba.org/show_bug.cgi?id=10673 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ira Cooper <ira@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Mon Jun 30 14:59:16 CEST 2014 on sn-devel-104 (cherry picked from commit cee1531e551e5ccd5ccd4a55de226ad686919486)
-rw-r--r--source3/smbd/smb2_lock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 6c81f5caf31..52698f3c4b9 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -724,6 +724,7 @@ static void reprocess_blocked_smb2_lock(struct smbd_smb2_request *smb2req,
fsp_fnum_dbg(fsp),
(int)state->lock_count));
+ remove_pending_lock(state, blr);
tevent_req_done(smb2req->subreq);
return;
}