Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] fix up documentation for change in ->queuecommand to lockless calling
[SCSI] bfa: rename log_level to bfa_log_level
+77
-73
+30
-27
Documentation/scsi/scsi_mid_low_api.txt
+30
-27
Documentation/scsi/scsi_mid_low_api.txt
···
1044
1044
1045
1045
1046
1046
/**
1047
-
* queuecommand - queue scsi command, invoke 'done' on completion
1047
+
* queuecommand - queue scsi command, invoke scp->scsi_done on completion
1048
+
* @shost: pointer to the scsi host object
1048
1049
* @scp: pointer to scsi command object
1049
-
* @done: function pointer to be invoked on completion
1050
1050
*
1051
1051
* Returns 0 on success.
1052
1052
*
···
1074
1074
*
1075
1075
* Other types of errors that are detected immediately may be
1076
1076
* flagged by setting scp->result to an appropriate value,
1077
-
* invoking the 'done' callback, and then returning 0 from this
1078
-
* function. If the command is not performed immediately (and the
1079
-
* LLD is starting (or will start) the given command) then this
1080
-
* function should place 0 in scp->result and return 0.
1077
+
* invoking the scp->scsi_done callback, and then returning 0
1078
+
* from this function. If the command is not performed
1079
+
* immediately (and the LLD is starting (or will start) the given
1080
+
* command) then this function should place 0 in scp->result and
1081
+
* return 0.
1081
1082
*
1082
1083
* Command ownership. If the driver returns zero, it owns the
1083
-
* command and must take responsibility for ensuring the 'done'
1084
-
* callback is executed. Note: the driver may call done before
1085
-
* returning zero, but after it has called done, it may not
1086
-
* return any value other than zero. If the driver makes a
1087
-
* non-zero return, it must not execute the command's done
1088
-
* callback at any time.
1084
+
* command and must take responsibility for ensuring the
1085
+
* scp->scsi_done callback is executed. Note: the driver may
1086
+
* call scp->scsi_done before returning zero, but after it has
1087
+
* called scp->scsi_done, it may not return any value other than
1088
+
* zero. If the driver makes a non-zero return, it must not
1089
+
* execute the command's scsi_done callback at any time.
1089
1090
*
1090
-
* Locks: struct Scsi_Host::host_lock held on entry (with "irqsave")
1091
-
* and is expected to be held on return.
1091
+
* Locks: up to and including 2.6.36, struct Scsi_Host::host_lock
1092
+
* held on entry (with "irqsave") and is expected to be
1093
+
* held on return. From 2.6.37 onwards, queuecommand is
1094
+
* called without any locks held.
1092
1095
*
1093
1096
* Calling context: in interrupt (soft irq) or process context
1094
1097
*
1095
-
* Notes: This function should be relatively fast. Normally it will
1096
-
* not wait for IO to complete. Hence the 'done' callback is invoked
1097
-
* (often directly from an interrupt service routine) some time after
1098
-
* this function has returned. In some cases (e.g. pseudo adapter
1099
-
* drivers that manufacture the response to a SCSI INQUIRY)
1100
-
* the 'done' callback may be invoked before this function returns.
1101
-
* If the 'done' callback is not invoked within a certain period
1102
-
* the SCSI mid level will commence error processing.
1103
-
* If a status of CHECK CONDITION is placed in "result" when the
1104
-
* 'done' callback is invoked, then the LLD driver should
1105
-
* perform autosense and fill in the struct scsi_cmnd::sense_buffer
1098
+
* Notes: This function should be relatively fast. Normally it
1099
+
* will not wait for IO to complete. Hence the scp->scsi_done
1100
+
* callback is invoked (often directly from an interrupt service
1101
+
* routine) some time after this function has returned. In some
1102
+
* cases (e.g. pseudo adapter drivers that manufacture the
1103
+
* response to a SCSI INQUIRY) the scp->scsi_done callback may be
1104
+
* invoked before this function returns. If the scp->scsi_done
1105
+
* callback is not invoked within a certain period the SCSI mid
1106
+
* level will commence error processing. If a status of CHECK
1107
+
* CONDITION is placed in "result" when the scp->scsi_done
1108
+
* callback is invoked, then the LLD driver should perform
1109
+
* autosense and fill in the struct scsi_cmnd::sense_buffer
1106
1110
* array. The scsi_cmnd::sense_buffer array is zeroed prior to
1107
1111
* the mid level queuing a command to an LLD.
1108
1112
*
1109
1113
* Defined in: LLD
1110
1114
**/
1111
-
int queuecommand(struct scsi_cmnd * scp,
1112
-
void (*done)(struct scsi_cmnd *))
1115
+
int queuecommand(struct Scsi_Host *shost, struct scsi_cmnd * scp)
1113
1116
1114
1117
1115
1118
/**
+2
-2
drivers/scsi/bfa/bfa_fcs.c
+2
-2
drivers/scsi/bfa/bfa_fcs.c
···
677
677
bfa_trc(fabric->fcs, event);
678
678
wwn2str(pwwn_ptr, fabric->bport.port_cfg.pwwn);
679
679
680
-
BFA_LOG(KERN_INFO, bfad, log_level,
680
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
681
681
"Port is isolated due to VF_ID mismatch. "
682
682
"PWWN: %s Port VF_ID: %04x switch port VF_ID: %04x.",
683
683
pwwn_ptr, fabric->fcs->port_vfid,
···
1411
1411
wwn2str(pwwn_ptr, bfa_fcs_lport_get_pwwn(&fabric->bport));
1412
1412
wwn2str(fwwn_ptr,
1413
1413
bfa_fcs_lport_get_fabric_name(&fabric->bport));
1414
-
BFA_LOG(KERN_WARNING, bfad, log_level,
1414
+
BFA_LOG(KERN_WARNING, bfad, bfa_log_level,
1415
1415
"Base port WWN = %s Fabric WWN = %s\n",
1416
1416
pwwn_ptr, fwwn_ptr);
1417
1417
}
+3
-3
drivers/scsi/bfa/bfa_fcs_fcpim.c
+3
-3
drivers/scsi/bfa/bfa_fcs_fcpim.c
···
261
261
bfa_fcb_itnim_online(itnim->itnim_drv);
262
262
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(itnim->rport->port));
263
263
wwn2str(rpwwn_buf, itnim->rport->pwwn);
264
-
BFA_LOG(KERN_INFO, bfad, log_level,
264
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
265
265
"Target (WWN = %s) is online for initiator (WWN = %s)\n",
266
266
rpwwn_buf, lpwwn_buf);
267
267
break;
···
301
301
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(itnim->rport->port));
302
302
wwn2str(rpwwn_buf, itnim->rport->pwwn);
303
303
if (bfa_fcs_lport_is_online(itnim->rport->port) == BFA_TRUE)
304
-
BFA_LOG(KERN_ERR, bfad, log_level,
304
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
305
305
"Target (WWN = %s) connectivity lost for "
306
306
"initiator (WWN = %s)\n", rpwwn_buf, lpwwn_buf);
307
307
else
308
-
BFA_LOG(KERN_INFO, bfad, log_level,
308
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
309
309
"Target (WWN = %s) offlined by initiator (WWN = %s)\n",
310
310
rpwwn_buf, lpwwn_buf);
311
311
break;
+5
-5
drivers/scsi/bfa/bfa_fcs_lport.c
+5
-5
drivers/scsi/bfa/bfa_fcs_lport.c
···
491
491
__port_action[port->fabric->fab_type].online(port);
492
492
493
493
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));
494
-
BFA_LOG(KERN_INFO, bfad, log_level,
494
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
495
495
"Logical port online: WWN = %s Role = %s\n",
496
496
lpwwn_buf, "Initiator");
497
497
···
512
512
513
513
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));
514
514
if (bfa_fcs_fabric_is_online(port->fabric) == BFA_TRUE)
515
-
BFA_LOG(KERN_ERR, bfad, log_level,
515
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
516
516
"Logical port lost fabric connectivity: WWN = %s Role = %s\n",
517
517
lpwwn_buf, "Initiator");
518
518
else
519
-
BFA_LOG(KERN_INFO, bfad, log_level,
519
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
520
520
"Logical port taken offline: WWN = %s Role = %s\n",
521
521
lpwwn_buf, "Initiator");
522
522
···
573
573
char lpwwn_buf[BFA_STRING_32];
574
574
575
575
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));
576
-
BFA_LOG(KERN_INFO, bfad, log_level,
576
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
577
577
"Logical port deleted: WWN = %s Role = %s\n",
578
578
lpwwn_buf, "Initiator");
579
579
···
878
878
vport ? vport->vport_drv : NULL);
879
879
880
880
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(lport));
881
-
BFA_LOG(KERN_INFO, bfad, log_level,
881
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
882
882
"New logical port created: WWN = %s Role = %s\n",
883
883
lpwwn_buf, "Initiator");
884
884
+3
-3
drivers/scsi/bfa/bfa_fcs_rport.c
+3
-3
drivers/scsi/bfa/bfa_fcs_rport.c
···
2056
2056
wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));
2057
2057
wwn2str(rpwwn_buf, rport->pwwn);
2058
2058
if (!BFA_FCS_PID_IS_WKA(rport->pid))
2059
-
BFA_LOG(KERN_INFO, bfad, log_level,
2059
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2060
2060
"Remote port (WWN = %s) online for logical port (WWN = %s)\n",
2061
2061
rpwwn_buf, lpwwn_buf);
2062
2062
}
···
2075
2075
wwn2str(rpwwn_buf, rport->pwwn);
2076
2076
if (!BFA_FCS_PID_IS_WKA(rport->pid)) {
2077
2077
if (bfa_fcs_lport_is_online(rport->port) == BFA_TRUE)
2078
-
BFA_LOG(KERN_ERR, bfad, log_level,
2078
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
2079
2079
"Remote port (WWN = %s) connectivity lost for "
2080
2080
"logical port (WWN = %s)\n",
2081
2081
rpwwn_buf, lpwwn_buf);
2082
2082
else
2083
-
BFA_LOG(KERN_INFO, bfad, log_level,
2083
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2084
2084
"Remote port (WWN = %s) offlined by "
2085
2085
"logical port (WWN = %s)\n",
2086
2086
rpwwn_buf, lpwwn_buf);
+4
-4
drivers/scsi/bfa/bfa_ioc.c
+4
-4
drivers/scsi/bfa/bfa_ioc.c
···
402
402
403
403
ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_OK);
404
404
bfa_ioc_hb_monitor(ioc);
405
-
BFA_LOG(KERN_INFO, bfad, log_level, "IOC enabled\n");
405
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level, "IOC enabled\n");
406
406
}
407
407
408
408
static void
···
444
444
{
445
445
struct bfad_s *bfad = (struct bfad_s *)ioc->bfa->bfad;
446
446
bfa_iocpf_disable(ioc);
447
-
BFA_LOG(KERN_INFO, bfad, log_level, "IOC disabled\n");
447
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level, "IOC disabled\n");
448
448
}
449
449
450
450
/*
···
565
565
notify->cbfn(notify->cbarg);
566
566
}
567
567
568
-
BFA_LOG(KERN_CRIT, bfad, log_level,
568
+
BFA_LOG(KERN_CRIT, bfad, bfa_log_level,
569
569
"Heart Beat of IOC has failed\n");
570
570
}
571
571
···
1812
1812
* Provide enable completion callback.
1813
1813
*/
1814
1814
ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE);
1815
-
BFA_LOG(KERN_WARNING, bfad, log_level,
1815
+
BFA_LOG(KERN_WARNING, bfad, bfa_log_level,
1816
1816
"Running firmware version is incompatible "
1817
1817
"with the driver version\n");
1818
1818
}
+14
-14
drivers/scsi/bfa/bfa_svc.c
+14
-14
drivers/scsi/bfa/bfa_svc.c
···
2138
2138
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2139
2139
BFA_PL_EID_PORT_DISABLE, 0, "Port Disable");
2140
2140
wwn2str(pwwn_buf, fcport->pwwn);
2141
-
BFA_LOG(KERN_INFO, bfad, log_level,
2141
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2142
2142
"Base port disabled: WWN = %s\n", pwwn_buf);
2143
2143
break;
2144
2144
···
2198
2198
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2199
2199
BFA_PL_EID_PORT_DISABLE, 0, "Port Disable");
2200
2200
wwn2str(pwwn_buf, fcport->pwwn);
2201
-
BFA_LOG(KERN_INFO, bfad, log_level,
2201
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2202
2202
"Base port disabled: WWN = %s\n", pwwn_buf);
2203
2203
break;
2204
2204
···
2251
2251
2252
2252
bfa_fcport_scn(fcport, BFA_PORT_LINKUP, BFA_FALSE);
2253
2253
wwn2str(pwwn_buf, fcport->pwwn);
2254
-
BFA_LOG(KERN_INFO, bfad, log_level,
2254
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2255
2255
"Base port online: WWN = %s\n", pwwn_buf);
2256
2256
break;
2257
2257
···
2277
2277
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2278
2278
BFA_PL_EID_PORT_DISABLE, 0, "Port Disable");
2279
2279
wwn2str(pwwn_buf, fcport->pwwn);
2280
-
BFA_LOG(KERN_INFO, bfad, log_level,
2280
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2281
2281
"Base port disabled: WWN = %s\n", pwwn_buf);
2282
2282
break;
2283
2283
···
2322
2322
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2323
2323
BFA_PL_EID_PORT_DISABLE, 0, "Port Disable");
2324
2324
wwn2str(pwwn_buf, fcport->pwwn);
2325
-
BFA_LOG(KERN_INFO, bfad, log_level,
2325
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2326
2326
"Base port offline: WWN = %s\n", pwwn_buf);
2327
-
BFA_LOG(KERN_INFO, bfad, log_level,
2327
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2328
2328
"Base port disabled: WWN = %s\n", pwwn_buf);
2329
2329
break;
2330
2330
···
2336
2336
BFA_PL_EID_PORT_ST_CHANGE, 0, "Port Linkdown");
2337
2337
wwn2str(pwwn_buf, fcport->pwwn);
2338
2338
if (BFA_PORT_IS_DISABLED(fcport->bfa))
2339
-
BFA_LOG(KERN_INFO, bfad, log_level,
2339
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2340
2340
"Base port offline: WWN = %s\n", pwwn_buf);
2341
2341
else
2342
-
BFA_LOG(KERN_ERR, bfad, log_level,
2342
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
2343
2343
"Base port (WWN = %s) "
2344
2344
"lost fabric connectivity\n", pwwn_buf);
2345
2345
break;
···
2349
2349
bfa_fcport_reset_linkinfo(fcport);
2350
2350
wwn2str(pwwn_buf, fcport->pwwn);
2351
2351
if (BFA_PORT_IS_DISABLED(fcport->bfa))
2352
-
BFA_LOG(KERN_INFO, bfad, log_level,
2352
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2353
2353
"Base port offline: WWN = %s\n", pwwn_buf);
2354
2354
else
2355
-
BFA_LOG(KERN_ERR, bfad, log_level,
2355
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
2356
2356
"Base port (WWN = %s) "
2357
2357
"lost fabric connectivity\n", pwwn_buf);
2358
2358
break;
···
2363
2363
bfa_fcport_scn(fcport, BFA_PORT_LINKDOWN, BFA_FALSE);
2364
2364
wwn2str(pwwn_buf, fcport->pwwn);
2365
2365
if (BFA_PORT_IS_DISABLED(fcport->bfa))
2366
-
BFA_LOG(KERN_INFO, bfad, log_level,
2366
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2367
2367
"Base port offline: WWN = %s\n", pwwn_buf);
2368
2368
else
2369
-
BFA_LOG(KERN_ERR, bfad, log_level,
2369
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
2370
2370
"Base port (WWN = %s) "
2371
2371
"lost fabric connectivity\n", pwwn_buf);
2372
2372
break;
···
2497
2497
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2498
2498
BFA_PL_EID_PORT_ENABLE, 0, "Port Enable");
2499
2499
wwn2str(pwwn_buf, fcport->pwwn);
2500
-
BFA_LOG(KERN_INFO, bfad, log_level,
2500
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2501
2501
"Base port enabled: WWN = %s\n", pwwn_buf);
2502
2502
break;
2503
2503
···
2551
2551
bfa_plog_str(fcport->bfa->plog, BFA_PL_MID_HAL,
2552
2552
BFA_PL_EID_PORT_ENABLE, 0, "Port Enable");
2553
2553
wwn2str(pwwn_buf, fcport->pwwn);
2554
-
BFA_LOG(KERN_INFO, bfad, log_level,
2554
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
2555
2555
"Base port enabled: WWN = %s\n", pwwn_buf);
2556
2556
break;
2557
2557
+4
-4
drivers/scsi/bfa/bfad.c
+4
-4
drivers/scsi/bfa/bfad.c
···
50
50
int rport_del_timeout = BFA_FCS_RPORT_DEF_DEL_TIMEOUT;
51
51
int bfa_lun_queue_depth = BFAD_LUN_QUEUE_DEPTH;
52
52
int bfa_io_max_sge = BFAD_IO_MAX_SGE;
53
-
int log_level = 3; /* WARNING log level */
53
+
int bfa_log_level = 3; /* WARNING log level */
54
54
int ioc_auto_recover = BFA_TRUE;
55
55
int bfa_linkup_delay = -1;
56
56
int fdmi_enable = BFA_TRUE;
···
108
108
MODULE_PARM_DESC(bfa_lun_queue_depth, "Lun queue depth, default=32, Range[>0]");
109
109
module_param(bfa_io_max_sge, int, S_IRUGO | S_IWUSR);
110
110
MODULE_PARM_DESC(bfa_io_max_sge, "Max io scatter/gather elements, default=255");
111
-
module_param(log_level, int, S_IRUGO | S_IWUSR);
112
-
MODULE_PARM_DESC(log_level, "Driver log level, default=3, "
111
+
module_param(bfa_log_level, int, S_IRUGO | S_IWUSR);
112
+
MODULE_PARM_DESC(bfa_log_level, "Driver log level, default=3, "
113
113
"Range[Critical:1|Error:2|Warning:3|Info:4]");
114
114
module_param(ioc_auto_recover, int, S_IRUGO | S_IWUSR);
115
115
MODULE_PARM_DESC(ioc_auto_recover, "IOC auto recovery, default=1, "
···
1112
1112
} else
1113
1113
bfad_os_rport_online_wait(bfad);
1114
1114
1115
-
BFA_LOG(KERN_INFO, bfad, log_level, "bfa device claimed\n");
1115
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level, "bfa device claimed\n");
1116
1116
1117
1117
return BFA_STATUS_OK;
1118
1118
}
+1
-1
drivers/scsi/bfa/bfad_drv.h
+1
-1
drivers/scsi/bfa/bfad_drv.h
+11
-10
drivers/scsi/bfa/bfad_im.c
+11
-10
drivers/scsi/bfa/bfad_im.c
···
225
225
}
226
226
227
227
bfa_trc(bfad, hal_io->iotag);
228
-
BFA_LOG(KERN_INFO, bfad, log_level, "scsi%d: abort cmnd %p iotag %x\n",
228
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
229
+
"scsi%d: abort cmnd %p iotag %x\n",
229
230
im_port->shost->host_no, cmnd, hal_io->iotag);
230
231
(void) bfa_ioim_abort(hal_io);
231
232
spin_unlock_irqrestore(&bfad->bfad_lock, flags);
···
242
241
243
242
cmnd->scsi_done(cmnd);
244
243
bfa_trc(bfad, hal_io->iotag);
245
-
BFA_LOG(KERN_INFO, bfad, log_level,
244
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
246
245
"scsi%d: complete abort 0x%p iotag 0x%x\n",
247
246
im_port->shost->host_no, cmnd, hal_io->iotag);
248
247
return SUCCESS;
···
261
260
262
261
tskim = bfa_tskim_alloc(&bfad->bfa, (struct bfad_tskim_s *) cmnd);
263
262
if (!tskim) {
264
-
BFA_LOG(KERN_ERR, bfad, log_level,
263
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
265
264
"target reset, fail to allocate tskim\n");
266
265
rc = BFA_STATUS_FAILED;
267
266
goto out;
···
312
311
313
312
tskim = bfa_tskim_alloc(&bfad->bfa, (struct bfad_tskim_s *) cmnd);
314
313
if (!tskim) {
315
-
BFA_LOG(KERN_ERR, bfad, log_level,
314
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
316
315
"LUN reset, fail to allocate tskim");
317
316
spin_unlock_irqrestore(&bfad->bfad_lock, flags);
318
317
rc = FAILED;
···
337
336
338
337
task_status = cmnd->SCp.Status >> 1;
339
338
if (task_status != BFI_TSKIM_STS_OK) {
340
-
BFA_LOG(KERN_ERR, bfad, log_level,
339
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
341
340
"LUN reset failure, status: %d\n", task_status);
342
341
rc = FAILED;
343
342
}
···
381
380
382
381
task_status = cmnd->SCp.Status >> 1;
383
382
if (task_status != BFI_TSKIM_STS_OK) {
384
-
BFA_LOG(KERN_ERR, bfad, log_level,
383
+
BFA_LOG(KERN_ERR, bfad, bfa_log_level,
385
384
"target reset failure,"
386
385
" status: %d\n", task_status);
387
386
err_cnt++;
···
461
460
fcid = bfa_fcs_itnim_get_fcid(&itnim_drv->fcs_itnim);
462
461
wwn2str(wwpn_str, wwpn);
463
462
fcid2str(fcid_str, fcid);
464
-
BFA_LOG(KERN_INFO, bfad, log_level,
463
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
465
464
"ITNIM FREE scsi%d: FCID: %s WWPN: %s\n",
466
465
port->im_port->shost->host_no,
467
466
fcid_str, wwpn_str);
···
590
589
bfad_im_scsi_host_free(struct bfad_s *bfad, struct bfad_im_port_s *im_port)
591
590
{
592
591
bfa_trc(bfad, bfad->inst_no);
593
-
BFA_LOG(KERN_INFO, bfad, log_level, "Free scsi%d\n",
592
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level, "Free scsi%d\n",
594
593
im_port->shost->host_no);
595
594
596
595
fc_remove_host(im_port->shost);
···
1049
1048
fcid2str(fcid_str, fcid);
1050
1049
list_add_tail(&itnim->list_entry,
1051
1050
&im_port->itnim_mapped_list);
1052
-
BFA_LOG(KERN_INFO, bfad, log_level,
1051
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
1053
1052
"ITNIM ONLINE Target: %d:0:%d "
1054
1053
"FCID: %s WWPN: %s\n",
1055
1054
im_port->shost->host_no,
···
1082
1081
wwn2str(wwpn_str, wwpn);
1083
1082
fcid2str(fcid_str, fcid);
1084
1083
list_del(&itnim->list_entry);
1085
-
BFA_LOG(KERN_INFO, bfad, log_level,
1084
+
BFA_LOG(KERN_INFO, bfad, bfa_log_level,
1086
1085
"ITNIM OFFLINE Target: %d:0:%d "
1087
1086
"FCID: %s WWPN: %s\n",
1088
1087
im_port->shost->host_no,