locking: Remove functions that are not used anymore
authorAmitay Isaacs <amitay@gmail.com>
Tue, 30 Apr 2013 05:13:44 +0000 (15:13 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Thu, 23 May 2013 23:06:40 +0000 (09:06 +1000)
These functions were used in locking child process to do the locking.  With
locking helper, these are not required.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
server/ctdb_lock.c

index 9469835397b70bf5484466a979e642edd7b280ec..d21d00f8c4517693dcb4465c7322fbc0b094597f 100644 (file)
@@ -353,68 +353,6 @@ static int ctdb_lockall_unmark(struct ctdb_context *ctdb)
 }
 
 
-/*
- * Lock record / db depending on lock_ctx->type
- * Called from child context.
- */
-static bool ctdb_lock_item(struct lock_context *lock_ctx)
-{
-       bool status = false;
-
-       switch (lock_ctx->type) {
-       case LOCK_RECORD:
-               if (tdb_chainlock(lock_ctx->ctdb_db->ltdb->tdb, lock_ctx->key) == 0) {
-                       status = true;
-               }
-               break;
-
-       case LOCK_DB:
-               if (tdb_lockall(lock_ctx->ctdb_db->ltdb->tdb) == 0) {
-                       status = true;
-               }
-               break;
-
-       case LOCK_ALLDB_PRIO:
-               if (ctdb_lockall_prio(lock_ctx->ctdb, lock_ctx->priority) == 0) {
-                       status = true;
-               }
-               break;
-
-       case LOCK_ALLDB:
-               if (ctdb_lockall(lock_ctx->ctdb) == 0) {
-                       status = true;
-               }
-               break;
-       }
-
-       return status;
-}
-
-
-/*
- * Unlock record / db depending on lock_ctx->type
- */
-void ctdb_unlock_item(struct lock_context *lock_ctx)
-{
-       switch (lock_ctx->type) {
-       case LOCK_RECORD:
-               tdb_chainunlock(lock_ctx->ctdb_db->ltdb->tdb, lock_ctx->key);
-               break;
-
-       case LOCK_DB:
-               tdb_unlockall(lock_ctx->ctdb_db->ltdb->tdb);
-               break;
-
-       case LOCK_ALLDB_PRIO:
-               ctdb_unlockall_prio(lock_ctx->ctdb, lock_ctx->priority);
-               break;
-
-       case LOCK_ALLDB:
-               ctdb_unlockall(lock_ctx->ctdb);
-               break;
-       }
-}
-
 static void ctdb_lock_schedule(struct ctdb_context *ctdb);
 
 /*
@@ -656,35 +594,6 @@ static void ctdb_lock_timeout_handler(struct tevent_context *ev,
 }
 
 
-static char *lock_child_log_prefix(struct lock_context *lock_ctx)
-{
-       char *prefix;
-       pid_t pid;
-
-       pid = getpid();
-
-       switch (lock_ctx->type) {
-       case LOCK_RECORD:
-               prefix = talloc_asprintf(NULL, "lockR(%d): ", pid);
-               break;
-
-       case LOCK_DB:
-               prefix = talloc_asprintf(NULL, "lockD(%d): ", pid);
-               break;
-
-       case LOCK_ALLDB_PRIO:
-               prefix = talloc_asprintf(NULL, "lockP(%d): ", pid);
-               break;
-
-       case LOCK_ALLDB:
-               prefix = talloc_asprintf(NULL, "lockA(%d): ", pid);
-               break;
-       }
-
-       return prefix;
-}
-
-
 static int db_count_handler(struct ctdb_db_context *ctdb_db, uint32_t priority,
                            void *private_data)
 {