ctdb-locking: Drop code for Samba 3.x compatibility

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index 8f3a18d4518957fac8604a2690ce2ae416bd1253..577a2d1bb75baa113437c5ed7112d1cb926690a8 100644 (file)
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -99,29 +99,6 @@ struct lock_request {
 };
 
 
-/*
- * Support samba 3.6.x (and older) versions which do not set db priority.
- *
- * By default, all databases are set to priority 1. So only when priority
- * is set to 1, check for databases that need higher priority.
- */
-static bool later_db(struct ctdb_context *ctdb, const char *name)
-{
-       if (ctdb->tunable.samba3_hack == 0) {
-               return false;
-       }
-
-       if (strstr(name, "brlock") ||
-           strstr(name, "g_lock") ||
-           strstr(name, "notify_onelevel") ||
-           strstr(name, "serverid") ||
-           strstr(name, "xattr_tdb")) {
-               return true;
-       }
-
-       return false;
-}
-
 int ctdb_db_prio_iterator(struct ctdb_context *ctdb, uint32_t priority,
                          ctdb_db_handler_t handler, void *private_data)
 {
@@ -132,24 +109,6 @@ int ctdb_db_prio_iterator(struct ctdb_context *ctdb, uint32_t priority,
                if (ctdb_db->priority != priority) {
                        continue;
                }
-               if (later_db(ctdb, ctdb_db->db_name)) {
-                       continue;
-               }
-               ret = handler(ctdb_db, private_data);
-               if (ret != 0) {
-                       return -1;
-               }
-       }
-
-       /* If priority != 1, later_db check is not required and can return */
-       if (priority != 1) {
-               return 0;
-       }
-
-       for (ctdb_db = ctdb->db_list; ctdb_db; ctdb_db = ctdb_db->next) {
-               if (!later_db(ctdb, ctdb_db->db_name)) {
-                       continue;
-               }
                ret = handler(ctdb_db, private_data);
                if (ret != 0) {
                        return -1;

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index 9c1e4a9d8e11d8ecb0c8842a1166229f5d4c1d08..1e86151dc761798d9f313e36ff7583c99c8182a8 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -90,7 +90,7 @@ static const struct {
        { "DBSizeWarn",        100000000,  offsetof(struct ctdb_tunable_list, db_size_warn), false },
        { "PullDBPreallocation", 10*1024*1024,  offsetof(struct ctdb_tunable_list, pulldb_preallocation_size), false },
        { "NoIPHostOnAllDisabled",    0,  offsetof(struct ctdb_tunable_list, no_ip_host_on_all_disabled), false },
-       { "Samba3AvoidDeadlocks", 0, offsetof(struct ctdb_tunable_list, samba3_hack), false },
+       { "Samba3AvoidDeadlocks", 0, offsetof(struct ctdb_tunable_list, samba3_hack), true },
        { "TDBMutexEnabled", 0, offsetof(struct ctdb_tunable_list, mutex_enabled), false },
        { "LockProcessesPerDB", 200, offsetof(struct ctdb_tunable_list, lock_processes_per_db), false },
        { "RecBufferSizeLimit", 1000000, offsetof(struct ctdb_tunable_list, rec_buffer_size_limit), false },