From 682eaed880404755f45dfe0b6db561bbf97b54d4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 28 Feb 2017 20:35:51 -0800 Subject: [PATCH] scst: Remove scst_device.dev_unregistering again See also: - commit 2e386ef7c12d ("Merge branch svn-trunk") - commit 3fc775c75af6 / r6589 ("EXTENDED COPY support") - commit 6c46b1a5a0c2 ("scst: Remove the dev_unregistering member variable") --- scst/include/scst.h | 8 -------- scst/src/scst_main.c | 3 --- 2 files changed, 11 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 7732538d6..d4ebe2c7e 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -2801,14 +2801,6 @@ struct scst_device { /* Set, if a strictly serialized cmd is waiting blocked */ unsigned int strictly_serialized_cmd_waiting:1; - /* - * Set, if this device is being unregistered. Useful to let sysfs - * attributes know when they should exit immediately to prevent - * possible deadlocks with their device unregistration waiting for - * their kobj last put. - */ - unsigned int dev_unregistering:1; - /* * Set if ext blocking is pending. It is just shortcut for * !list_empty(&dev->ext_blockers_list) to save a cache miss. diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c index 8466fb6ce..55b027e81 100644 --- a/scst/src/scst_main.c +++ b/scst/src/scst_main.c @@ -1522,7 +1522,6 @@ out: return res; out_unreg: - dev->dev_unregistering = 1; list_del(&dev->dev_list_entry); scst_assign_dev_handler(dev, &scst_null_devtype); goto out_pr_clear_dev; @@ -1577,8 +1576,6 @@ void scst_unregister_virtual_device(int id) goto out_unlock; } - dev->dev_unregistering = 1; - scst_cm_on_dev_unregister(dev); list_del_init(&dev->dev_list_entry);