nfsd4: setclientid_confirm callback-change fixes

[safe/jmp/linux-2.6] / drivers / scsi / lpfc / lpfc_hbadisc.c

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index ba12053..311ed6d 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -350,7 +350,7 @@ lpfc_send_fastpath_evt(struct lpfc_hba *phba,
                        evt_data_size = sizeof(fast_evt_data->un.
                                read_check_error);
                } else if ((evt_sub_category == LPFC_EVENT_FABRIC_BUSY) ||
-                       (evt_sub_category == IOSTAT_NPORT_BSY)) {
+                       (evt_sub_category == LPFC_EVENT_PORT_BUSY)) {
                        evt_data = (char *) &fast_evt_data->un.fabric_evt;
                        evt_data_size = sizeof(fast_evt_data->un.fabric_evt);
                } else {
@@ -1964,10 +1964,10 @@ lpfc_set_disctmo(struct lpfc_vport *vport)
        uint32_t tmo;
 
        if (vport->port_state == LPFC_LOCAL_CFG_LINK) {
-               /* For FAN, timeout should be greater then edtov */
+               /* For FAN, timeout should be greater than edtov */
                tmo = (((phba->fc_edtov + 999) / 1000) + 1);
        } else {
-               /* Normal discovery timeout should be > then ELS/CT timeout
+               /* Normal discovery timeout should be > than ELS/CT timeout
                 * FC spec states we need 3 * ratov for CT requests
                 */
                tmo = ((phba->fc_ratov * 3) + 3);