These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / scsi / zfcp_fsf.c

diff --git a/kernel/drivers/s390/scsi/zfcp_fsf.c b/kernel/drivers/s390/scsi/zfcp_fsf.c
index 21ec5e2..522a633 100644 (file)
--- a/kernel/drivers/s390/scsi/zfcp_fsf.c
+++ b/kernel/drivers/s390/scsi/zfcp_fsf.c
@@ -114,7 +114,7 @@ static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req,
        if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED)
                return;
 
-       atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status);
+       atomic_or(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status);
 
        zfcp_scsi_schedule_rports_block(adapter);
 
@@ -204,7 +204,7 @@ static void zfcp_fsf_status_read_link_down(struct zfcp_fsf_req *req)
                break;
        case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE:
                zfcp_fsf_link_down_info_eval(req, NULL);
-       };
+       }
 }
 
 static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req)
@@ -345,7 +345,7 @@ static void zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *req)
                zfcp_erp_adapter_shutdown(adapter, 0, "fspse_3");
                break;
        case FSF_PROT_HOST_CONNECTION_INITIALIZING:
-               atomic_set_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
+               atomic_or(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
                                &adapter->status);
                break;
        case FSF_PROT_DUPLICATE_REQUEST_ID:
@@ -554,7 +554,7 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
                        zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh1");
                        return;
                }
-               atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
+               atomic_or(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
                                &adapter->status);
                break;
        case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE:
@@ -567,7 +567,7 @@ static void zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *req)
 
                /* avoids adapter shutdown to be able to recognize
                 * events such as LINK UP */
-               atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
+               atomic_or(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
                                &adapter->status);
                zfcp_fsf_link_down_info_eval(req,
                        &qtcb->header.fsf_status_qual.link_down_info);
@@ -1394,9 +1394,9 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                break;
        case FSF_GOOD:
                port->handle = header->port_handle;
-               atomic_set_mask(ZFCP_STATUS_COMMON_OPEN |
+               atomic_or(ZFCP_STATUS_COMMON_OPEN |
                                ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
-               atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_BOXED,
+               atomic_andnot(ZFCP_STATUS_COMMON_ACCESS_BOXED,
                                  &port->status);
                /* check whether D_ID has changed during open */
                /*
@@ -1677,10 +1677,10 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req)
        case FSF_PORT_BOXED:
                /* can't use generic zfcp_erp_modify_port_status because
                 * ZFCP_STATUS_COMMON_OPEN must not be reset for the port */
-               atomic_clear_mask(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
+               atomic_andnot(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
                shost_for_each_device(sdev, port->adapter->scsi_host)
                        if (sdev_to_zfcp(sdev)->port == port)
-                               atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN,
+                               atomic_andnot(ZFCP_STATUS_COMMON_OPEN,
                                                  &sdev_to_zfcp(sdev)->status);
                zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_ACCESS_BOXED);
                zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
@@ -1700,10 +1700,10 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req)
                /* can't use generic zfcp_erp_modify_port_status because
                 * ZFCP_STATUS_COMMON_OPEN must not be reset for the port
                 */
-               atomic_clear_mask(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
+               atomic_andnot(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
                shost_for_each_device(sdev, port->adapter->scsi_host)
                        if (sdev_to_zfcp(sdev)->port == port)
-                               atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN,
+                               atomic_andnot(ZFCP_STATUS_COMMON_OPEN,
                                                  &sdev_to_zfcp(sdev)->status);
                break;
        }
@@ -1766,7 +1766,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
 
        zfcp_sdev = sdev_to_zfcp(sdev);
 
-       atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
+       atomic_andnot(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                          ZFCP_STATUS_COMMON_ACCESS_BOXED,
                          &zfcp_sdev->status);
 
@@ -1822,7 +1822,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
 
        case FSF_GOOD:
                zfcp_sdev->lun_handle = header->lun_handle;
-               atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &zfcp_sdev->status);
+               atomic_or(ZFCP_STATUS_COMMON_OPEN, &zfcp_sdev->status);
                break;
        }
 }
@@ -1913,7 +1913,7 @@ static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req)
                }
                break;
        case FSF_GOOD:
-               atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN, &zfcp_sdev->status);
+               atomic_andnot(ZFCP_STATUS_COMMON_OPEN, &zfcp_sdev->status);
                break;
        }
 }