diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/durable.c | 4 | ||||
| -rw-r--r-- | source3/smbd/oplock.c | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c index cf837aa2cf..69ba109895 100644 --- a/source3/smbd/durable.c +++ b/source3/smbd/durable.c @@ -173,10 +173,6 @@ NTSTATUS vfs_default_durable_disconnect(struct files_struct *fsp, return NT_STATUS_NOT_SUPPORTED; } - if (fsp->num_pending_break_messages > 0) { - return NT_STATUS_NOT_SUPPORTED; - } - /* * For now let it be simple and do not keep * delete on close files durable open diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 2a0d2278f8..aa8484a4c0 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -525,12 +525,9 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, } if (fsp->sent_oplock_break != NO_BREAK_SENT) { - /* Remember we have to inform the requesting PID when the - * client replies */ - msg.pid = src; - ADD_TO_ARRAY(NULL, struct share_mode_entry, msg, - &fsp->pending_break_messages, - &fsp->num_pending_break_messages); + /* + * Nothing to do anymore + */ return; } @@ -567,11 +564,6 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, fsp->sent_oplock_break = break_to_level2 ? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT; - msg.pid = src; - ADD_TO_ARRAY(NULL, struct share_mode_entry, msg, - &fsp->pending_break_messages, - &fsp->num_pending_break_messages); - add_oplock_timeout_handler(fsp); } |