From fcafaf6022832835fc8fa76a4c33056605dc53e4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 11 Sep 2013 16:07:33 +0000 Subject: smbd: Remove FAKE_LEVEL_II_OPLOCK FAKE_LEVEL_II_OPLOCK was an indicator to break level2 oplock holders on write. This information is now being held in brlock.tdb, which makes the FAKE_LEVEL_II_OPLOCK type unnecessary. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/locking/locking.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source3/locking') diff --git a/source3/locking/locking.c b/source3/locking/locking.c index b9db27cb86..7ac04a45e3 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -823,19 +823,7 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp) return False; } - if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) { - /* - * Going from exclusive or batch, - * we always go through FAKE_LEVEL_II - * first. - */ - if (!EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { - smb_panic("remove_share_oplock: logic error"); - } - e->op_type = FAKE_LEVEL_II_OPLOCK; - } else { - e->op_type = NO_OPLOCK; - } + e->op_type = NO_OPLOCK; lck->data->modified = True; return True; } -- cgit