dlm: keep lkbs in idr

This is simpler and quicker than the hash table, and
avoids needing to search the hash list for every new
lkid to check if it's used.

Signed-off-by: David Teigland <teigland@redhat.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index ad3b5a8535d0..4e20f9317156 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -94,7 +94,6 @@ struct dlm_cluster {
         unsigned int cl_tcp_port;
         unsigned int cl_buffer_size;
         unsigned int cl_rsbtbl_size;
-        unsigned int cl_lkbtbl_size;
         unsigned int cl_dirtbl_size;
         unsigned int cl_recover_timer;
         unsigned int cl_toss_secs;
@@ -109,7 +108,6 @@ enum {
         CLUSTER_ATTR_TCP_PORT = 0,
         CLUSTER_ATTR_BUFFER_SIZE,
         CLUSTER_ATTR_RSBTBL_SIZE,
-        CLUSTER_ATTR_LKBTBL_SIZE,
         CLUSTER_ATTR_DIRTBL_SIZE,
         CLUSTER_ATTR_RECOVER_TIMER,
         CLUSTER_ATTR_TOSS_SECS,
@@ -162,7 +160,6 @@ __CONFIGFS_ATTR(name, 0644, name##_read, name##_write)
 CLUSTER_ATTR(tcp_port, 1);
 CLUSTER_ATTR(buffer_size, 1);
 CLUSTER_ATTR(rsbtbl_size, 1);
-CLUSTER_ATTR(lkbtbl_size, 1);
 CLUSTER_ATTR(dirtbl_size, 1);
 CLUSTER_ATTR(recover_timer, 1);
 CLUSTER_ATTR(toss_secs, 1);
@@ -176,7 +173,6 @@ static struct configfs_attribute *cluster_attrs[] = {
         [CLUSTER_ATTR_TCP_PORT] = &cluster_attr_tcp_port.attr,
         [CLUSTER_ATTR_BUFFER_SIZE] = &cluster_attr_buffer_size.attr,
         [CLUSTER_ATTR_RSBTBL_SIZE] = &cluster_attr_rsbtbl_size.attr,
-        [CLUSTER_ATTR_LKBTBL_SIZE] = &cluster_attr_lkbtbl_size.attr,
         [CLUSTER_ATTR_DIRTBL_SIZE] = &cluster_attr_dirtbl_size.attr,
         [CLUSTER_ATTR_RECOVER_TIMER] = &cluster_attr_recover_timer.attr,
         [CLUSTER_ATTR_TOSS_SECS] = &cluster_attr_toss_secs.attr,
@@ -446,7 +442,6 @@ static struct config_group *make_cluster(struct config_group *g,
         cl->cl_tcp_port = dlm_config.ci_tcp_port;
         cl->cl_buffer_size = dlm_config.ci_buffer_size;
         cl->cl_rsbtbl_size = dlm_config.ci_rsbtbl_size;
-        cl->cl_lkbtbl_size = dlm_config.ci_lkbtbl_size;
         cl->cl_dirtbl_size = dlm_config.ci_dirtbl_size;
         cl->cl_recover_timer = dlm_config.ci_recover_timer;
         cl->cl_toss_secs = dlm_config.ci_toss_secs;
@@ -1038,7 +1033,6 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num)
 #define DEFAULT_TCP_PORT       21064
 #define DEFAULT_BUFFER_SIZE     4096
 #define DEFAULT_RSBTBL_SIZE     1024
-#define DEFAULT_LKBTBL_SIZE     1024
 #define DEFAULT_DIRTBL_SIZE     1024
 #define DEFAULT_RECOVER_TIMER      5
 #define DEFAULT_TOSS_SECS         10
@@ -1052,7 +1046,6 @@ struct dlm_config_info dlm_config = {
         .ci_tcp_port = DEFAULT_TCP_PORT,
         .ci_buffer_size = DEFAULT_BUFFER_SIZE,
         .ci_rsbtbl_size = DEFAULT_RSBTBL_SIZE,
-        .ci_lkbtbl_size = DEFAULT_LKBTBL_SIZE,
         .ci_dirtbl_size = DEFAULT_DIRTBL_SIZE,
         .ci_recover_timer = DEFAULT_RECOVER_TIMER,
         .ci_toss_secs = DEFAULT_TOSS_SECS,