[SCSI] zfcp: Move ACL/CFDC code to zfcp_cfdc.c

Move the code evaluating the ACL/CFDC specific errors to the file
zfcp_cfdc.c. With this change, all code related to the old access
control feature is kept in one file, not split across zfcp_erp.c and
zfcp_fsf.c.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 0 insertions, 82 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 734fc838931..9e7d029ac7a 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1593,85 +1593,3 @@ void zfcp_erp_lun_boxed(struct scsi_device *sdev, char *id, void *ref)
                                    ZFCP_STATUS_COMMON_ACCESS_BOXED, ZFCP_SET);
         zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED, id, ref);
 }
-
-/**
- * zfcp_erp_port_access_denied - Adapter denied access to port.
- * @port: port where access has been denied
- * @id: id for debug trace
- * @ref: reference for debug trace
- *
- * Since the adapter has denied access, stop using the port and the
- * attached LUNs.
- */
-void zfcp_erp_port_access_denied(struct zfcp_port *port, char *id, void *ref)
-{
-        zfcp_erp_modify_port_status(port, id, ref,
-                                    ZFCP_STATUS_COMMON_ERP_FAILED |
-                                    ZFCP_STATUS_COMMON_ACCESS_DENIED, ZFCP_SET);
-}
-
-/**
- * zfcp_erp_lun_access_denied - Adapter denied access to LUN.
- * @sdev: SCSI device / LUN where access has been denied
- * @id: id for debug trace
- * @ref: reference for debug trace
- *
- * Since the adapter has denied access, stop using the LUN.
- */
-void zfcp_erp_lun_access_denied(struct scsi_device *sdev, char *id, void *ref)
-{
-        zfcp_erp_modify_lun_status(sdev, id, ref,
-                                   ZFCP_STATUS_COMMON_ERP_FAILED |
-                                   ZFCP_STATUS_COMMON_ACCESS_DENIED, ZFCP_SET);
-}
-
-static void zfcp_erp_lun_access_changed(struct scsi_device *sdev, char *id,
-                                        void *ref)
-{
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
-        int status = atomic_read(&zfcp_sdev->status);
-
-        if (!(status & (ZFCP_STATUS_COMMON_ACCESS_DENIED |
-                        ZFCP_STATUS_COMMON_ACCESS_BOXED)))
-                return;
-
-        zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED, id, ref);
-}
-
-static void zfcp_erp_port_access_changed(struct zfcp_port *port, char *id,
-                                         void *ref)
-{
-        struct scsi_device *sdev;
-        int status = atomic_read(&port->status);
-
-        if (!(status & (ZFCP_STATUS_COMMON_ACCESS_DENIED |
-                        ZFCP_STATUS_COMMON_ACCESS_BOXED))) {
-                shost_for_each_device(sdev, port->adapter->scsi_host)
-                        if (sdev_to_zfcp(sdev)->port == port)
-                                zfcp_erp_lun_access_changed(sdev, id, ref);
-                return;
-        }
-
-        zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED, id, ref);
-}
-
-/**
- * zfcp_erp_adapter_access_changed - Process change in adapter ACT
- * @adapter: Adapter where the Access Control Table (ACT) changed
- * @id: Id for debug trace
- * @ref: Reference for debug trace
- */
-void zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter, char *id,
-                                     void *ref)
-{
-        unsigned long flags;
-        struct zfcp_port *port;
-
-        if (adapter->connection_features & FSF_FEATURE_NPIV_MODE)
-                return;
-
-        read_lock_irqsave(&adapter->port_list_lock, flags);
-        list_for_each_entry(port, &adapter->port_list, list)
-                zfcp_erp_port_access_changed(port, id, ref);
-        read_unlock_irqrestore(&adapter->port_list_lock, flags);
-}