Skip to content

Commit b88b249

Browse files
Alexander Aringteigland
authored andcommitted
dlm: remove scand leftovers
This patch removes some leftover related code from dlm_scand that was dropped in commit b1f2381 ("dlm: drop dlm_scand kthread and use timers"). Signed-off-by: Alexander Aring <[email protected]> Signed-off-by: David Teigland <[email protected]>
1 parent 1613e60 commit b88b249

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

fs/dlm/dlm_internal.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -559,13 +559,6 @@ struct rcom_lock {
559559
char rl_lvb[];
560560
};
561561

562-
/*
563-
* The max number of resources per rsbtbl bucket that shrink will attempt
564-
* to remove in each iteration.
565-
*/
566-
567-
#define DLM_REMOVE_NAMES_MAX 8
568-
569562
struct dlm_ls {
570563
struct list_head ls_list; /* list of lockspaces */
571564
dlm_lockspace_t *ls_local_handle;
@@ -578,7 +571,6 @@ struct dlm_ls {
578571
wait_queue_head_t ls_count_wait;
579572
int ls_create_count; /* create/release refcount */
580573
unsigned long ls_flags; /* LSFL_ */
581-
unsigned long ls_scan_time;
582574
struct kobject ls_kobj;
583575

584576
struct idr ls_lkbidr;

fs/dlm/lockspace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ static int new_lockspace(const char *name, const char *cluster,
410410
atomic_set(&ls->ls_count, 0);
411411
init_waitqueue_head(&ls->ls_count_wait);
412412
ls->ls_flags = 0;
413-
ls->ls_scan_time = jiffies;
414413

415414
if (ops && dlm_config.ci_recover_callbacks) {
416415
ls->ls_ops = ops;

0 commit comments

Comments
 (0)