mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 04:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spelling fix: occured -> occurred

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5950 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-12-22 12:35:00 +00:00
parent 5154cbcf5a
commit dd249ab556
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qla2x00t/qla2x00-target/qla2x00t.c
View File

@@ -5405,11 +5405,11 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *ha,
case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */
case MBA_ATIO_TRANSFER_ERR: /* ATIO Queue Transfer Error */
TRACE(TRACE_MGMT, "qla2x00t(%ld): System error async event %#x "
"occured", ha->instance, code);
"occurred", ha->instance, code);
break;
case MBA_LOOP_UP:
TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop up occured",
TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop up occurred",
ha->instance);
if (tgt->link_reinit_iocb_pending) {
q24_send_notify_ack(ha, &tgt->link_reinit_iocb, 0, 0, 0);
@@ -5418,28 +5418,28 @@ static void q2t_async_event(uint16_t code, scsi_qla_host_t *ha,
break;
case MBA_LIP_OCCURRED:
TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP occured", ha->instance);
TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP occurred", ha->instance);
break;
case MBA_LOOP_DOWN:
TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop down occured",
TRACE(TRACE_MGMT, "qla2x00t(%ld): Loop down occurred",
ha->instance);
break;
case MBA_LIP_RESET:
TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP reset occured",
TRACE(TRACE_MGMT, "qla2x00t(%ld): LIP reset occurred",
ha->instance);
break;
case MBA_PORT_UPDATE:
case MBA_RSCN_UPDATE:
TRACE_MGMT_DBG("qla2x00t(%ld): Port update async event %#x "
"occured", ha->instance, code);
"occurred", ha->instance, code);
/* .mark_all_devices_lost() is handled by the initiator driver */
break;
default:
TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occured: "
TRACE(TRACE_MGMT, "qla2x00t(%ld): Async event %#x occurred: "
"ignoring (m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)",
ha->instance, code,
le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),

2
qla2x00t/qla_init.c
View File

@@ -2147,7 +2147,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
DEBUG3(printk("%s: exiting normally\n", __func__));
}
/* Restore state if a resync event occured during processing */
/* Restore state if a resync event occurred during processing */
if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
if (test_bit(LOCAL_LOOP_UPDATE, &save_flags))
set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);

6
qla2x00t/qla_iocb.c
View File

@@ -261,7 +261,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
* qla2x00_start_scsi() - Send a SCSI command to the ISP
* @sp: command to send to the ISP
*
* Returns non-zero if a failure occured, else zero.
* Returns non-zero if a failure occurred, else zero.
*/
int
qla2x00_start_scsi(srb_t *sp)
@@ -407,7 +407,7 @@ queuing_error:
*
* Can be called from both normal and interrupt context.
*
* Returns non-zero if a failure occured, else zero.
* Returns non-zero if a failure occurred, else zero.
*
* Hardware lock must be held on entrance. Might release it, then reacquire.
*/
@@ -671,7 +671,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
* qla24xx_start_scsi() - Send a SCSI command to the ISP
* @sp: command to send to the ISP
*
* Returns non-zero if a failure occured, else zero.
* Returns non-zero if a failure occurred, else zero.
*/
int
qla24xx_start_scsi(srb_t *sp)

6
qla2x00t/qla_isr.c
View File

@@ -419,9 +419,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
break;
case MBA_LIP_OCCURRED: /* Loop Initialization Procedure */
DEBUG2(printk("scsi(%ld): LIP occured (%x).\n", ha->host_no,
DEBUG2(printk("scsi(%ld): LIP occurred (%x).\n", ha->host_no,
mb[1]));
qla_printk(KERN_INFO, ha, "LIP occured (%x).\n", mb[1]);
qla_printk(KERN_INFO, ha, "LIP occurred (%x).\n", mb[1]);
if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
atomic_set(&ha->loop_state, LOOP_DOWN);
@@ -488,7 +488,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
DEBUG2(printk("scsi(%ld): Asynchronous LIP RESET (%x).\n",
ha->host_no, mb[1]));
qla_printk(KERN_INFO, ha,
"LIP reset occured (%x).\n", mb[1]);
"LIP reset occurred (%x).\n", mb[1]);
if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
atomic_set(&ha->loop_state, LOOP_DOWN);

4
qla2x00t/qla_mbx.c
View File

@@ -232,7 +232,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)
DEBUG2_3_11(printk("%s(%ld): timeout schedule "
"isp_abort_needed.\n", __func__, ha->host_no));
qla_printk(KERN_WARNING, ha,
"Mailbox command timeout occured. Scheduling ISP "
"Mailbox command timeout occurred. Scheduling ISP "
"abort.\n");
set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
qla2xxx_wake_dpc(ha);
@@ -243,7 +243,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)
DEBUG2_3_11(printk("%s(%ld): timeout calling "
"abort_isp\n", __func__, ha->host_no));
qla_printk(KERN_WARNING, ha,
"Mailbox command timeout occured. Issuing ISP "
"Mailbox command timeout occurred. Issuing ISP "
"abort.\n");
set_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);

28
scstadmin/scstadmin.procfs/scst-0.8.22/lib/SCST/SCST.pm
View File

@@ -534,7 +534,7 @@ sub openDevice {
$rc = !$self->handlerDeviceExists($handler, $device);
if ($rc) {
$self->{'error'} = "openDevice(): An error occured while opening device '$device'. ".
$self->{'error'} = "openDevice(): An error occurred while opening device '$device'. ".
"See dmesg/kernel log for more information.";
}
@@ -575,7 +575,7 @@ sub closeDevice {
$rc = $self->handlerDeviceExists($handler, $device);
if ($rc) {
$self->{'error'} = "closeDevice(): An error occured while closing device '$device'. ".
$self->{'error'} = "closeDevice(): An error occurred while closing device '$device'. ".
"See dmesg/kernel log for more information.";
}
@@ -647,7 +647,7 @@ sub setT10DeviceId {
my $devices = $self->handlerDevices($handler);
if ($$devices{$device}->{'T10_DEVICE_ID'} ne $t10_id) {
$self->{'error'} = "setT10DeviceId(): An error occured while setting T10 device ID to '$t10_id' ".
$self->{'error'} = "setT10DeviceId(): An error occurred while setting T10 device ID to '$t10_id' ".
"for device '$device'. See dmesg/kernel log for more information.";
return 1;
}
@@ -720,7 +720,7 @@ sub addUser {
$rc = !$self->userExists($user, $group);
if ($rc) {
$self->{'error'} = "addUser(): An error occured while adding user '$user' to group '$group'. ".
$self->{'error'} = "addUser(): An error occurred while adding user '$user' to group '$group'. ".
"See dmesg/kernel log for more information.";
}
@@ -752,7 +752,7 @@ sub removeUser {
$rc = $self->userExists($user, $group);
if ($rc) {
$self->{'error'} = "removeUser(): An error occured while removing user '$user' ".
$self->{'error'} = "removeUser(): An error occurred while removing user '$user' ".
"from group '$group'. See dmesg/kernel log for more information.";
}
@@ -795,7 +795,7 @@ sub moveUser {
$rc = !$self->userExists($user, $toGroup);
if ($rc) {
$self->{'error'} = "addUser(): An error occured while moving user '$user' from group '$fromGroup' ".
$self->{'error'} = "addUser(): An error occurred while moving user '$user' from group '$fromGroup' ".
"to group '$toGroup'. See dmesg/kernel log for more information.";
}
@@ -818,7 +818,7 @@ sub clearUsers {
return 0 if ($self->{'debug'});
if ($rc) {
$self->{'error'} = "clearUsers(): An error occured while clearing users from ".
$self->{'error'} = "clearUsers(): An error occurred while clearing users from ".
"group '$group'. See dmesg/kernel log for more information.";
return $rc;
}
@@ -956,7 +956,7 @@ sub assignDeviceToGroup {
$rc = !$self->groupDeviceExists($device, $group, $lun);
if ($rc) {
$self->{'error'} = "assignDeviceToGroup(): An error occured while assigning device '$device' ".
$self->{'error'} = "assignDeviceToGroup(): An error occurred while assigning device '$device' ".
"to group '$group'. See dmesg/kernel log for more information.";
}
@@ -1003,7 +1003,7 @@ sub replaceDeviceInGroup {
$rc = !$self->groupDeviceExists($newDevice, $group, $lun);
if ($rc) {
$self->{'error'} = "replaceDeviceInGroup(): An error occured while replacing lun '$lun' with ".
$self->{'error'} = "replaceDeviceInGroup(): An error occurred while replacing lun '$lun' with ".
" device '$newDevice' in group '$group'. See dmesg/kernel log for more information.";
}
@@ -1044,7 +1044,7 @@ sub assignDeviceToHandler {
$rc = !$self->handlerDeviceExists($handler, $device);
if ($rc) {
$self->{'error'} = "assignDeviceToHandler(): An error occured while assigning device '$device' ".
$self->{'error'} = "assignDeviceToHandler(): An error occurred while assigning device '$device' ".
"to handler '$handler_name' ($handler). See dmesg/kernel log for more information.";
}
@@ -1076,7 +1076,7 @@ sub removeDeviceFromGroup {
$rc = $self->groupDeviceExists($device, $group);
if ($rc) {
$self->{'error'} = "removeDeviceFromGroup(): An error occured while removing device '$device' ".
$self->{'error'} = "removeDeviceFromGroup(): An error occurred while removing device '$device' ".
"from group '$group'. See dmesg/kernel log for more information.";
}
@@ -1096,7 +1096,7 @@ sub clearGroupDevices {
return 0 if ($self->{'debug'});
if ($rc) {
$self->{'error'} = "clearGroupDevices(): An error occured while clearing devices from ".
$self->{'error'} = "clearGroupDevices(): An error occurred while clearing devices from ".
"group '$group'. See dmesg/kernel log for more information.";
return $rc;
}
@@ -1544,8 +1544,8 @@ Returns: (int) $success
=item SCST::SCST->errorString();
Contains a description of the last error occured or undef if no error
has occured or if this method has already been called once since the
Contains a description of the last error occurred or undef if no error
has occurred or if this method has already been called once since the
last error.
Arguments: (void)

4
scstadmin/scstadmin.procfs/scstadmin
View File

@@ -1265,7 +1265,7 @@ sub addDevice {
my $htype = $SCST->handlerType($_handler);
if (!$htype) {
print "WARNING: Internal error occured: ".$SCST->errorString()."\n";
print "WARNING: Internal error occurred: ".$SCST->errorString()."\n";
return $TRUE;
}
@@ -1327,7 +1327,7 @@ sub removeDevice {
my $htype = $SCST->handlerType($_handler);
if (!$htype) {
print "WARNING: Internal error occured: ".$SCST->errorString()."\n";
print "WARNING: Internal error occurred: ".$SCST->errorString()."\n";
return $TRUE;
}

2
scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
View File

@@ -176,7 +176,7 @@ SCST_C_TGRP_TGT_SETATTR_FAIL => 172,
};
my %VERBOSE_ERROR = (
(SCST_C_FATAL_ERROR) => 'A fatal error occured. See "dmesg" for more information.',
(SCST_C_FATAL_ERROR) => 'A fatal error occurred. See "dmesg" for more information.',
(SCST_C_BAD_ATTRIBUTES) => 'Bad attributes given for SCST.',
(SCST_C_ATTRIBUTE_STATIC) => 'SCST attribute specified is static',
(SCST_C_SETATTR_FAIL) => 'Failed to set a SCST attribute. See "dmesg" for more information.',