diff options
| -rw-r--r-- | source3/include/vfs.h | 5 | ||||
| -rw-r--r-- | source3/smbd/durable.c | 4 | ||||
| -rw-r--r-- | source3/smbd/oplock.c | 14 |
3 files changed, 5 insertions, 18 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 6d9be77bfd..0e5b074867 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -152,6 +152,8 @@ connection_struct a pointer. */ /* Leave at 31 - not yet released. Add share_access to vuid_cache_entry. */ /* Leave at 31 - not yet released. add SMB_VFS_COPY_CHUNK() */ +/* Leave at 31 - not yet released. Remove the unused + fsp->pending_break_messages array */ #define SMB_VFS_INTERFACE_VERSION 31 @@ -224,9 +226,6 @@ typedef struct files_struct { struct lock_struct last_lock_failure; int current_lock_count; /* Count the number of outstanding locks and pending locks. */ - struct share_mode_entry *pending_break_messages; - int num_pending_break_messages; - bool can_lock; bool can_read; bool can_write; 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); } |