diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-03-04 14:11:53 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-04 14:40:50 +0100 |
| commit | 1f5301c1d2182993d8f8cdaa65763408faff080d (patch) | |
| tree | baa36ecac317b8549ac60d13fd2ff5111eca14b8 | |
| parent | af0d863ce78a4afb1e2add837613a665d54031eb (diff) | |
| download | samba-1f5301c1d2182993d8f8cdaa65763408faff080d.tar.gz samba-1f5301c1d2182993d8f8cdaa65763408faff080d.tar.bz2 samba-1f5301c1d2182993d8f8cdaa65763408faff080d.zip | |
pvfs_oplock: only a break level2 oplocks...
It seems that I've tested this in the wrong way before.
metze
(This used to be commit 21772fa33d772a9df6ff04a0ed1b0d8f4f533295)
| -rw-r--r-- | source4/ntvfs/posix/pvfs_oplock.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source4/ntvfs/posix/pvfs_oplock.c b/source4/ntvfs/posix/pvfs_oplock.c index b830ad2adc..3f581e5443 100644 --- a/source4/ntvfs/posix/pvfs_oplock.c +++ b/source4/ntvfs/posix/pvfs_oplock.c @@ -218,7 +218,7 @@ NTSTATUS pvfs_break_level2_oplocks(struct pvfs_file *f) struct odb_lock *olck; NTSTATUS status; - if (h->oplock && h->oplock->level == OPLOCK_EXCLUSIVE) { + if (h->oplock && h->oplock->level != OPLOCK_LEVEL_II) { return NT_STATUS_OK; } @@ -228,16 +228,6 @@ NTSTATUS pvfs_break_level2_oplocks(struct pvfs_file *f) return NT_STATUS_FOOBAR; } - if (h->oplock && h->oplock->level == OPLOCK_BATCH) { - status = odb_update_oplock(olck, h, OPLOCK_LEVEL_II); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0,("Unable to update oplock level for '%s' - %s\n", - h->name->full_name, nt_errstr(status))); - talloc_free(olck); - return status; - } - } - status = odb_break_oplocks(olck); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Unable to break level2 oplocks to none for '%s' - %s\n", |