diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-05 21:02:24 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-02-05 22:17:26 -0800 |
| commit | 74267d652485cdcb711f734f0d80da0fb1495867 (patch) | |
| tree | 83aa8d90713105d2eaaabf5d059a13bca58d6be1 | |
| parent | 5b398edbee672392f2cea260ab17445ecca927d7 (diff) | |
| download | samba-74267d652485cdcb711f734f0d80da0fb1495867.tar.gz samba-74267d652485cdcb711f734f0d80da0fb1495867.tar.bz2 samba-74267d652485cdcb711f734f0d80da0fb1495867.zip | |
s3-brlock: we don't need these MSG_SMB_UNLOCK calls now
These have been replaced with the min timeout in blocking.c
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 8 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 84bba3bea3..8ddb12a765 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -542,15 +542,7 @@ static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length, messaging_send(conn->msg_ctx, procid_self(), MSG_SMB_BRL_VALIDATE, &data_blob_null); - /* - * it's possible that we have just rejoined the cluster after - * an outage. In that case our pending locks could have been - * removed from the lockdb, so retry them once more - */ - message_send_all(conn->msg_ctx, MSG_SMB_UNLOCK, NULL, 0, NULL); - TALLOC_FREE(buf); - return NT_STATUS_OK; } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index fb0efd2ae5..8a7a3b28c0 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -230,8 +230,6 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown) DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", (unsigned int)pid)); messaging_send_buf(smbd_messaging_context(), procid_self(), MSG_SMB_BRL_VALIDATE, NULL, 0); - message_send_all(smbd_messaging_context(), - MSG_SMB_UNLOCK, NULL, 0, NULL); } for (child = children; child != NULL; child = child->next) { |