src/delta_lease.c | 7 -------
src/host_id.c | 2 +-
src/leader.h | 2 +-
src/paxos_lease.c | 7 -------
src/sanlock_internal.h | 1 -
5 files changed, 2 insertions(+), 17 deletions(-)
New commits:
commit 23fc027e8bc1eece21f0fe8f7b3b5e4af9c7de3c
Author: David Teigland <teigland(a)redhat.com>
Date: Wed Apr 13 13:56:24 2011 -0500
sanlock: remove remaining cluster_mode
Remove last traces of this (unused).
diff --git a/src/delta_lease.c b/src/delta_lease.c
index 6804e78..b2e9dda 100644
--- a/src/delta_lease.c
+++ b/src/delta_lease.c
@@ -53,12 +53,6 @@ static int verify_leader(struct sync_disk *disk,
return DP_BAD_VERSION;
}
- if (lr->cluster_mode != options.cluster_mode) {
- log_error("verify_leader wrong cluster mode %d %d %s",
- lr->cluster_mode, options.cluster_mode, disk->path);
- return DP_BAD_CLUSTERMODE;
- }
-
if (lr->sector_size != disk->sector_size) {
log_error("verify_leader wrong sector size %d %d %s",
lr->sector_size, disk->sector_size, disk->path);
@@ -312,7 +306,6 @@ int delta_lease_init(struct sync_disk *disk, char *space_name, int
max_hosts)
leader.magic = DELTA_DISK_MAGIC;
leader.version = DELTA_DISK_VERSION_MAJOR | DELTA_DISK_VERSION_MINOR;
- leader.cluster_mode = options.cluster_mode;
leader.sector_size = disk->sector_size;
leader.max_hosts = 1;
leader.timestamp = LEASE_FREE;
diff --git a/src/host_id.c b/src/host_id.c
index 8c8056a..7d2836a 100644
--- a/src/host_id.c
+++ b/src/host_id.c
@@ -289,7 +289,7 @@ int add_space(struct space *sp)
{
int rv, result;
- if (!sp->name[0]) {
+ if (!sp->space_name[0]) {
log_erros(sp, "add_space no name");
rv = -EINVAL;
goto fail;
diff --git a/src/leader.h b/src/leader.h
index 735a6d1..c3e25b4 100644
--- a/src/leader.h
+++ b/src/leader.h
@@ -79,7 +79,7 @@ enum {
struct leader_record {
uint32_t magic;
uint32_t version;
- uint32_t cluster_mode;
+ uint32_t unused0;
uint32_t sector_size;
uint64_t num_hosts;
uint64_t max_hosts;
diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index b4797b2..2934b6b 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -415,12 +415,6 @@ static int verify_leader(struct token *token, struct sync_disk
*disk,
return DP_BAD_VERSION;
}
- if (lr->cluster_mode != options.cluster_mode) {
- log_errot(token, "verify_leader wrong cluster mode %d %d %s",
- lr->cluster_mode, options.cluster_mode, disk->path);
- return DP_BAD_CLUSTERMODE;
- }
-
if (lr->sector_size != disk->sector_size) {
log_errot(token, "verify_leader wrong sector size %d %d %s",
lr->sector_size, disk->sector_size, disk->path);
@@ -929,7 +923,6 @@ int paxos_lease_init(struct token *token, int num_hosts, int
max_hosts)
leader.magic = PAXOS_DISK_MAGIC;
leader.version = PAXOS_DISK_VERSION_MAJOR | PAXOS_DISK_VERSION_MINOR;
- leader.cluster_mode = options.cluster_mode;
leader.sector_size = token->disks[0].sector_size;
leader.num_hosts = num_hosts;
leader.max_hosts = max_hosts;
diff --git a/src/sanlock_internal.h b/src/sanlock_internal.h
index 88cabe1..7e305af 100644
--- a/src/sanlock_internal.h
+++ b/src/sanlock_internal.h
@@ -270,7 +270,6 @@ struct options {
int use_aio;
int use_watchdog;
int high_priority;
- uint32_t cluster_mode;
};
/* values used while processing command, not afterward */
Show replies by date