diff options
| author | Volker Lendecke <vl@samba.org> | 2013-09-11 16:07:33 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-10-15 01:52:29 +0200 |
| commit | fcafaf6022832835fc8fa76a4c33056605dc53e4 (patch) | |
| tree | b9da13ff8580780efff786c9eff37b599b6fa9bb /source3/locking | |
| parent | eb50c18c4a2d0caa3b8d21b2e1b536adc8dc0276 (diff) | |
| download | samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.tar.gz samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.tar.bz2 samba-fcafaf6022832835fc8fa76a4c33056605dc53e4.zip | |
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 <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/locking.c | 14 |
1 files changed, 1 insertions, 13 deletions
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; } |