sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

smbd: Remove the unused fsp->pending_break_messages array

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2013-04-12 14:09:12 +02:00 committed by Jeremy Allison
parent 3e7923d7af
commit f52a3c3cd1
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/include/vfs.h
View File

@ -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;

4
source3/smbd/durable.c
View File

@ -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

14
source3/smbd/oplock.c
View File

@ -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);
}