[lustre-devel] [PATCH 27/27] lustre: obd: remove unused obd_evict_inprogress

From: Timothy Day <[email protected]>

Remove the atomic_t struct field obd_evict_inprogress
from 'struct obd_device'. This field was only ever
incremented in a unused function that was removed in
a previous patch. Hence, remove it altogther. This
patch also removes the associated wait queue.

WC-bug-id: https://jira.whamcloud.com/browse/LU-16965
Lustre-commit: d5051f374799bed52 ("LU-16965 obd: remove unused obd_evict_inprogress")
Signed-off-by: Timothy Day <[email protected]>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51681
Reviewed-by: Patrick Farrell <[email protected]>
Reviewed-by: James Simmons <[email protected]>
Reviewed-by: Oleg Drokin <[email protected]>
Signed-off-by: James Simmons <[email protected]>
---
 fs/lustre/include/obd.h     | 2 --
 fs/lustre/obdclass/genops.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/fs/lustre/include/obd.h b/fs/lustre/include/obd.h
index 8f6d42544711..f385c677020e 100644
--- a/fs/lustre/include/obd.h
+++ b/fs/lustre/include/obd.h
@@ -620,8 +620,6 @@ struct obd_device {
 	struct lprocfs_stats	*obd_svc_stats;
 	const struct attribute **obd_attrs;
 	struct ldebugfs_vars	*obd_vars;
-	atomic_t		 obd_evict_inprogress;
-	wait_queue_head_t	 obd_evict_inprogress_waitq;
 	struct list_head	 obd_evict_list; /* protected with pet_lock */
 
 	/**
diff --git a/fs/lustre/obdclass/genops.c b/fs/lustre/obdclass/genops.c
index 0cbc2c7c393d..935ba92c387a 100644
--- a/fs/lustre/obdclass/genops.c
+++ b/fs/lustre/obdclass/genops.c
@@ -309,8 +309,6 @@ struct obd_device *class_newdev(const char *type_name, const char *name,
 
 	/* XXX belongs in setup not attach  */
 	init_rwsem(&newdev->obd_observer_link_sem);
-	/* recovery data */
-	init_waitqueue_head(&newdev->obd_evict_inprogress_waitq);
 
 	llog_group_init(&newdev->obd_olg);
 	/* Detach drops this */
-- 
2.39.3

_______________________________________________
lustre-devel mailing list
[email protected]
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org