dlm: remove scand leftovers

This patch removes some leftover related code from dlm_scand that was
dropped in commit b1f2381c1a8d ("dlm: drop dlm_scand kthread and use
timers").

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

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index 9085ba3b2f20152aa7d2502d3794771437f9becf..9618ce0720d9d56119466594fed91db14641391b 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -559,13 +559,6 @@ struct rcom_lock {
        char                    rl_lvb[];
 };
 
-/*
- * The max number of resources per rsbtbl bucket that shrink will attempt
- * to remove in each iteration.
- */
-
-#define DLM_REMOVE_NAMES_MAX 8
-
 struct dlm_ls {
        struct list_head        ls_list;        /* list of lockspaces */
        dlm_lockspace_t         *ls_local_handle;
@@ -578,7 +571,6 @@ struct dlm_ls {
        wait_queue_head_t       ls_count_wait;
        int                     ls_create_count; /* create/release refcount */
        unsigned long           ls_flags;       /* LSFL_ */
-       unsigned long           ls_scan_time;
        struct kobject          ls_kobj;
 
        struct idr              ls_lkbidr;

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 475ab4370ddae3e3728f76aa80c9e07b0fa9b211..b6a1a6eb7f277e3317b31e8f393b6b38ea5bee74 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -410,7 +410,6 @@ static int new_lockspace(const char *name, const char *cluster,
        atomic_set(&ls->ls_count, 0);
        init_waitqueue_head(&ls->ls_count_wait);
        ls->ls_flags = 0;
-       ls->ls_scan_time = jiffies;
 
        if (ops && dlm_config.ci_recover_callbacks) {
                ls->ls_ops = ops;