s3-brlock: we don't need these MSG_SMB_UNLOCK calls now
authorAndrew Tridgell <tridge@samba.org>
Sat, 6 Feb 2010 05:02:24 +0000 (21:02 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 6 Feb 2010 06:17:26 +0000 (22:17 -0800)
These have been replaced with the min timeout in blocking.c

source3/lib/ctdbd_conn.c
source3/smbd/server.c

index 84bba3bea35c21e9c1b98d6f9ad81e3ba932bab9..8ddb12a765bd296fdc42752b2df439552d0d71fd 100644 (file)
@@ -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);
 
                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);
                TALLOC_FREE(buf);
-
                return NT_STATUS_OK;
        }
 
                return NT_STATUS_OK;
        }
 
index fb0efd2ae5202ed5315e3cd4b972e8783c89e6fb..8a7a3b28c05b59d5c46ba6ef9b3bab4025eeff79 100644 (file)
@@ -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);
                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) {
        }
 
        for (child = children; child != NULL; child = child->next) {