summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-23 10:07:45 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-27 15:28:10 +0100
commit4a2271349503933776f9d2791edfcb874a2c7261 (patch)
treea8fa8ab63ea63c4efdf576cecf659cf45cce062d /source3
parentb8c416fe2ac37b3ba0124811cfeddf2015c8d31f (diff)
downloadsamba-4a2271349503933776f9d2791edfcb874a2c7261.tar.gz
samba-4a2271349503933776f9d2791edfcb874a2c7261.tar.bz2
samba-4a2271349503933776f9d2791edfcb874a2c7261.zip
s3:smbd: remove pointless respond_to_all_remaining_local_messages() function
This the process_kernel_oplock() function never response to messages, it only generates messages to ourself. metze
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/smbd/process.c25
-rw-r--r--source3/smbd/server.c2
3 files changed, 0 insertions, 28 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index dd5b601c2c..1713760666 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7126,7 +7126,6 @@ struct idle_event *event_add_idle(struct event_context *event_ctx,
void *private_data),
void *private_data);
NTSTATUS allow_new_trans(struct trans_state *list, int mid);
-void respond_to_all_remaining_local_messages(void);
void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes);
const char *smb_fn_name(int type);
void add_to_common_flags2(uint32 v);
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2326bdab90..9527d94825 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -904,31 +904,6 @@ NTSTATUS allow_new_trans(struct trans_state *list, int mid)
return NT_STATUS_OK;
}
-/****************************************************************************
- We're terminating and have closed all our files/connections etc.
- If there are any pending local messages we need to respond to them
- before termination so that other smbds don't think we just died whilst
- holding oplocks.
-****************************************************************************/
-
-void respond_to_all_remaining_local_messages(void)
-{
- /*
- * Assert we have no exclusive open oplocks.
- */
-
- if(get_number_of_exclusive_open_oplocks()) {
- DEBUG(0,("respond_to_all_remaining_local_messages: PANIC : we have %d exclusive oplocks.\n",
- get_number_of_exclusive_open_oplocks() ));
- return;
- }
-
- process_kernel_oplocks(smbd_messaging_context());
-
- return;
-}
-
-
/*
These flags determine some of the permissions required to do an operation
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e6ea5f3986..7bc96ff5fb 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -832,8 +832,6 @@ static void exit_server_common(enum server_exit_reason how,
/* delete our entry in the connections database. */
yield_connection(NULL,"");
- respond_to_all_remaining_local_messages();
-
#ifdef WITH_DFS
if (dcelogin_atmost_once) {
dfs_unlogin();