diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index af79880d2..f06a4c66f 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -3378,7 +3378,7 @@ static bool iscsi_is_delay_tm_resp(struct iscsi_cmnd *rsp) return res; } -/* Called under sn_lock, but might drop it inside, then reaquire */ +/* Called under sn_lock, but might drop it inside, then reacquire */ static void iscsi_check_send_delayed_tm_resp(struct iscsi_session *sess) __acquires(&sn_lock) __releases(&sn_lock) diff --git a/iscsi-scst/kernel/nthread.c b/iscsi-scst/kernel/nthread.c index 8efcc5c40..95a399a7f 100644 --- a/iscsi-scst/kernel/nthread.c +++ b/iscsi-scst/kernel/nthread.c @@ -1007,7 +1007,7 @@ out: /* * Called under rd_lock and BHs disabled, but will drop it inside, - * then reaquire. + * then reacquire. */ static void scst_do_job_rd(struct iscsi_thread_pool *p) __acquires(&rd_lock) @@ -1742,7 +1742,7 @@ out: /* * Called under wr_lock and BHs disabled, but will drop it inside, - * then reaquire. + * then reacquire. */ static void scst_do_job_wr(struct iscsi_thread_pool *p) __acquires(&wr_lock) diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index 7864f9a68..c1bc416e6 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -351,7 +351,7 @@ static inline request_t *q2t_req_pkt(scsi_qla_host_t *ha) return qla2x00_req_pkt(to_qla_parent(ha)); } -/* Might release hw lock, then reaquire!! */ +/* Might release hw lock, then reacquire!! */ static inline int q2t_issue_marker(scsi_qla_host_t *ha, int ha_locked) { /* Send marker if required */ @@ -1469,7 +1469,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2x_modify_command_count(scsi_qla_host_t *ha, int cmd_count, int imm_count) @@ -1522,7 +1522,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2x_send_notify_ack(scsi_qla_host_t *ha, notify_entry_t *iocb, uint32_t add_flags, uint16_t resp_code, int resp_code_valid, @@ -1585,7 +1585,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_send_abts_resp(scsi_qla_host_t *ha, const abts24_recv_entry_t *abts, uint32_t status, bool ids_reversed) @@ -1666,7 +1666,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_retry_term_exchange(scsi_qla_host_t *ha, abts24_resp_fw_entry_t *entry) @@ -1761,7 +1761,7 @@ out_free: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_handle_abts(scsi_qla_host_t *ha, abts24_recv_entry_t *abts) { @@ -1818,7 +1818,7 @@ out_err: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_send_task_mgmt_ctio(scsi_qla_host_t *ha, struct q2t_mgmt_cmd *mcmd, uint32_t resp_code) @@ -1869,7 +1869,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_send_notify_ack(scsi_qla_host_t *ha, notify24xx_entry_t *iocb, uint16_t srr_flags, @@ -2095,7 +2095,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static inline void *q2t_get_req_pkt(scsi_qla_host_t *ha) { @@ -3029,7 +3029,7 @@ static int q2t_rdy_to_xfer(struct scst_cmd *scst_cmd) return res; } -/* If hardware_lock held on entry, might drop it, then reaquire */ +/* If hardware_lock held on entry, might drop it, then reacquire */ static void q2x_send_term_exchange(scsi_qla_host_t *ha, struct q2t_cmd *cmd, atio_entry_t *atio, int ha_locked) { @@ -3103,7 +3103,7 @@ out: return; } -/* If hardware_lock held on entry, might drop it, then reaquire */ +/* If hardware_lock held on entry, might drop it, then reacquire */ static void q24_send_term_exchange(scsi_qla_host_t *ha, struct q2t_cmd *cmd, atio7_entry_t *atio, int ha_locked) { @@ -3294,7 +3294,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static int q2t_term_ctio_exchange(scsi_qla_host_t *ha, void *ctio, struct q2t_cmd *cmd, uint32_t status) @@ -3415,7 +3415,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2t_do_ctio_completion(scsi_qla_host_t *ha, uint32_t handle, uint32_t status, void *ctio) @@ -4046,7 +4046,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static int q24_handle_els(scsi_qla_host_t *ha, notify24xx_entry_t *iocb) { @@ -4615,7 +4615,7 @@ out_reject: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2t_handle_imm_notify(scsi_qla_host_t *ha, void *iocb) { @@ -4766,7 +4766,7 @@ static void q2t_handle_imm_notify(scsi_qla_host_t *ha, void *iocb) } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2x_send_busy(scsi_qla_host_t *ha, atio_entry_t *atio) { @@ -4813,7 +4813,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q24_send_busy(scsi_qla_host_t *ha, atio7_entry_t *atio, uint16_t status) @@ -5221,7 +5221,7 @@ out: } /* - * pha->hardware_lock supposed to be held on entry. Might drop it, then reaquire + * pha->hardware_lock supposed to be held on entry. Might drop it, then reacquire */ static void q2t_async_event(uint16_t code, scsi_qla_host_t *ha, uint16_t *mailbox) diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index 2aba62175..b6dc97275 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -119,7 +119,7 @@ struct q2t_tgt { /* * To sync between IRQ handlers and q2t_target_release(). Needed, - * because req_pkt() can drop/reaquire HW lock inside. Protected by + * because req_pkt() can drop/reacquire HW lock inside. Protected by * HW lock. */ int irq_cmd_count; diff --git a/qla2x00t/qla2x_tgt.h b/qla2x00t/qla2x_tgt.h index 429b4adcd..abb0c4e8e 100644 --- a/qla2x00t/qla2x_tgt.h +++ b/qla2x00t/qla2x_tgt.h @@ -70,7 +70,7 @@ static inline void qla_reverse_ini_mode(scsi_qla_host_t *ha) * ha = adapter block pointer. * * Caller MUST have hardware lock held. This function might release it, - * then reaquire. + * then reacquire. */ static inline void __qla2x00_send_enable_lun(scsi_qla_host_t *ha, int enable) diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c index 16090e6a7..f74f77b5e 100644 --- a/qla2x00t/qla_init.c +++ b/qla2x00t/qla_init.c @@ -4182,7 +4182,7 @@ EXPORT_SYMBOL(qla2x00_disable_tgt_mode); * qla2x00_issue_marker * Issue marker * Caller CAN have hardware lock held as specified by ha_locked parameter. - * Might release it, then reaquire. + * Might release it, then reacquire. */ int qla2x00_issue_marker(scsi_qla_host_t *ha, int ha_locked) { diff --git a/qla2x00t/qla_iocb.c b/qla2x00t/qla_iocb.c index 667f5224b..3507b7447 100644 --- a/qla2x00t/qla_iocb.c +++ b/qla2x00t/qla_iocb.c @@ -408,7 +408,7 @@ queuing_error: * * Returns non-zero if a failure occured, else zero. * - * Hardware lock must be held on entrance. Might release it, then reaquire. + * Hardware lock must be held on entrance. Might release it, then reacquire. */ int __qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun, @@ -469,7 +469,7 @@ qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun, * @ha: HA context * * Note: The caller must hold the hardware lock before calling this routine. - * Might release it, then reaquire. + * Might release it, then reacquire. * * Returns NULL if function failed, else, a pointer to the request packet. */