1 files changed, 17 insertions, 32 deletions

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 895a9ff17379..bcbf22ee0aa7 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -474,6 +474,21 @@ static void srp_free_req_data(struct srp_target_port *target)
         }
 }
 
+/**
+ * srp_del_scsi_host_attr() - Remove attributes defined in the host template.
+ * @shost: SCSI host whose attributes to remove from sysfs.
+ *
+ * Note: Any attributes defined in the host template and that did not exist
+ * before invocation of this function will be ignored.
+ */
+static void srp_del_scsi_host_attr(struct Scsi_Host *shost)
+{
+        struct device_attribute **attr;
+
+        for (attr = shost->hostt->shost_attrs; attr && *attr; ++attr)
+                device_remove_file(&shost->shost_dev, *attr);
+}
+
 static void srp_remove_work(struct work_struct *work)
 {
         struct srp_target_port *target =
@@ -486,6 +501,7 @@ static void srp_remove_work(struct work_struct *work)
         list_del(&target->list);
         spin_unlock(&target->srp_host->target_lock);
 
+        srp_del_scsi_host_attr(target->scsi_host);
         srp_remove_host(target->scsi_host);
         scsi_remove_host(target->scsi_host);
         ib_destroy_cm_id(target->cm_id);
@@ -1678,10 +1694,6 @@ static ssize_t show_id_ext(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->id_ext));
 }
@@ -1691,10 +1703,6 @@ static ssize_t show_ioc_guid(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->ioc_guid));
 }
@@ -1704,10 +1712,6 @@ static ssize_t show_service_id(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%016llx\n",
                        (unsigned long long) be64_to_cpu(target->service_id));
 }
@@ -1717,10 +1721,6 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "0x%04x\n", be16_to_cpu(target->path.pkey));
 }
 
@@ -1729,10 +1729,6 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%pI6\n", target->path.dgid.raw);
 }
 
@@ -1741,10 +1737,6 @@ static ssize_t show_orig_dgid(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%pI6\n", target->orig_dgid);
 }
 
@@ -1753,10 +1745,6 @@ static ssize_t show_req_lim(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%d\n", target->req_lim);
 }
 
@@ -1765,10 +1753,6 @@ static ssize_t show_zero_req_lim(struct device *dev,
 {
         struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-        if (target->state == SRP_TARGET_DEAD ||
-            target->state == SRP_TARGET_REMOVED)
-                return -ENODEV;
-
         return sprintf(buf, "%d\n", target->zero_req_lim);
 }
 
@@ -2432,6 +2416,7 @@ static void srp_remove_one(struct ib_device *device)
 
                 list_for_each_entry_safe(target, tmp_target,
                                          &host->target_list, list) {
+                        srp_del_scsi_host_attr(target->scsi_host);
                         srp_remove_host(target->scsi_host);
                         scsi_remove_host(target->scsi_host);
                         srp_disconnect_target(target);