Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ea4a3a6ac40e2a585654808d4aefb39a6d57dca0

Authored by Swen Schillig
Committed by James Bottomley
1 parent 250a1352b9
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[SCSI] zfcp: Redesign of the debug tracing final cleanup. 

This patch is the final cleanup of the redesign from the zfcp tracing.
Structures and elements which were used by multiple areas of the
former debug tracing are now changed to the new scheme.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 12 changed files with 180 additions and 181 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_aux.c
Diff comments   View file @ ea4a3a6
... ... @@ -311,8 +311,7 @@
311 311 if (zfcp_fsf_status_read(adapter->qdio)) {
312 312 if (atomic_read(&adapter->stat_miss) >=
313 313 adapter->stat_read_buf_num) {
314   - zfcp_erp_adapter_reopen(adapter, 0, "axsref1",
315   - NULL);
  314 + zfcp_erp_adapter_reopen(adapter, 0, "axsref1");
316 315 return 1;
317 316 }
318 317 break;
... ... @@ -459,7 +458,7 @@
459 458 sysfs_remove_group(&cdev->dev.kobj, &zfcp_sysfs_adapter_attrs);
460 459  
461 460 zfcp_erp_thread_kill(adapter);
462   - zfcp_dbf_adapter_unregister(adapter->dbf);
  461 + zfcp_dbf_adapter_unregister(adapter);
463 462 zfcp_qdio_destroy(adapter->qdio);
464 463  
465 464 zfcp_ccw_adapter_put(adapter); /* final put to release */
drivers/s390/scsi/zfcp_ccw.c
Diff comments   View file @ ea4a3a6
... ... @@ -48,7 +48,7 @@
48 48  
49 49 zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);
50 50 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
51   - "ccresu2", NULL);
  51 + "ccresu2");
52 52 zfcp_erp_wait(adapter);
53 53 flush_work(&adapter->scan_work);
54 54  
... ... @@ -182,7 +182,7 @@
182 182 if (!adapter)
183 183 return 0;
184 184  
185   - zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1", NULL);
  185 + zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1");
186 186 zfcp_erp_wait(adapter);
187 187  
188 188 zfcp_ccw_adapter_put(adapter);
189 189  
190 190  
191 191  
... ... @@ -207,24 +207,24 @@
207 207 switch (event) {
208 208 case CIO_GONE:
209 209 dev_warn(&cdev->dev, "The FCP device has been detached\n");
210   - zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1", NULL);
  210 + zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1");
211 211 break;
212 212 case CIO_NO_PATH:
213 213 dev_warn(&cdev->dev,
214 214 "The CHPID for the FCP device is offline\n");
215   - zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2", NULL);
  215 + zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2");
216 216 break;
217 217 case CIO_OPER:
218 218 dev_info(&cdev->dev, "The FCP device is operational again\n");
219 219 zfcp_erp_set_adapter_status(adapter,
220 220 ZFCP_STATUS_COMMON_RUNNING);
221 221 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
222   - "ccnoti4", NULL);
  222 + "ccnoti4");
223 223 break;
224 224 case CIO_BOXED:
225 225 dev_warn(&cdev->dev, "The FCP device did not respond within "
226 226 "the specified time\n");
227   - zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5", NULL);
  227 + zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5");
228 228 break;
229 229 }
230 230  
... ... @@ -243,7 +243,7 @@
243 243 if (!adapter)
244 244 return;
245 245  
246   - zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1", NULL);
  246 + zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1");
247 247 zfcp_erp_wait(adapter);
248 248 zfcp_erp_thread_kill(adapter);
249 249  
drivers/s390/scsi/zfcp_cfdc.c
Diff comments   View file @ ea4a3a6
... ... @@ -288,7 +288,7 @@
288 288 (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
289 289 zfcp_erp_port_reopen(port,
290 290 ZFCP_STATUS_COMMON_ERP_FAILED,
291   - "cfaac_1", NULL);
  291 + "cfaac_1");
292 292 }
293 293 read_unlock_irqrestore(&adapter->port_list_lock, flags);
294 294  
... ... @@ -299,7 +299,7 @@
299 299 (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
300 300 zfcp_erp_lun_reopen(sdev,
301 301 ZFCP_STATUS_COMMON_ERP_FAILED,
302   - "cfaac_2", NULL);
  302 + "cfaac_2");
303 303 }
304 304 }
305 305  
... ... @@ -426,7 +426,7 @@
426 426 zfcp_scsi_dev_lun(sdev),
427 427 (unsigned long long)zfcp_sdev->port->wwpn);
428 428 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);
429   - zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6", NULL);
  429 + zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6");
430 430 return -EACCES;
431 431 }
432 432  
... ... @@ -437,7 +437,7 @@
437 437 zfcp_scsi_dev_lun(sdev),
438 438 (unsigned long long)zfcp_sdev->port->wwpn);
439 439 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);
440   - zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8", NULL);
  440 + zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8");
441 441 return -EACCES;
442 442 }
443 443  
drivers/s390/scsi/zfcp_dbf.c
Diff comments   View file @ ea4a3a6
... ... @@ -377,26 +377,37 @@
377 377 }
378 378 }
379 379  
380   - debug_event(adapter->dbf->scsi, 1, rec, sizeof(*rec));
  380 + debug_event(dbf->scsi, 1, rec, sizeof(*rec));
381 381 spin_unlock_irqrestore(&dbf->scsi_lock, flags);
382 382 }
383 383  
384   -static debug_info_t *zfcp_dbf_reg(const char *name, int level,
385   - struct debug_view *view, int size)
  384 +static debug_info_t *zfcp_dbf_reg(const char *name, int size, int rec_size)
386 385 {
387 386 struct debug_info *d;
388 387  
389   - d = debug_register(name, dbfsize, level, size);
  388 + d = debug_register(name, size, 1, rec_size);
390 389 if (!d)
391 390 return NULL;
392 391  
393 392 debug_register_view(d, &debug_hex_ascii_view);
394   - debug_register_view(d, view);
395   - debug_set_level(d, level);
  393 + debug_set_level(d, 3);
396 394  
397 395 return d;
398 396 }
399 397  
  398 +static void zfcp_dbf_unregister(struct zfcp_dbf *dbf)
  399 +{
  400 + if (!dbf)
  401 + return;
  402 +
  403 + debug_unregister(dbf->scsi);
  404 + debug_unregister(dbf->san);
  405 + debug_unregister(dbf->hba);
  406 + debug_unregister(dbf->pay);
  407 + debug_unregister(dbf->rec);
  408 + kfree(dbf);
  409 +}
  410 +
400 411 /**
401 412 * zfcp_adapter_debug_register - registers debug feature for an adapter
402 413 * @adapter: pointer to adapter for which debug features should be registered
403 414  
... ... @@ -404,15 +415,13 @@
404 415 */
405 416 int zfcp_dbf_adapter_register(struct zfcp_adapter *adapter)
406 417 {
407   - char dbf_name[DEBUG_MAX_NAME_LEN];
  418 + char name[DEBUG_MAX_NAME_LEN];
408 419 struct zfcp_dbf *dbf;
409 420  
410 421 dbf = kzalloc(sizeof(struct zfcp_dbf), GFP_KERNEL);
411 422 if (!dbf)
412 423 return -ENOMEM;
413 424  
414   - dbf->adapter = adapter;
415   -
416 425 spin_lock_init(&dbf->pay_lock);
417 426 spin_lock_init(&dbf->hba_lock);
418 427 spin_lock_init(&dbf->san_lock);
419 428  
420 429  
421 430  
422 431  
423 432  
424 433  
425 434  
426 435  
427 436  
428 437  
... ... @@ -420,59 +429,52 @@
420 429 spin_lock_init(&dbf->rec_lock);
421 430  
422 431 /* debug feature area which records recovery activity */
423   - sprintf(dbf_name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));
424   - dbf->rec = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_rec));
  432 + sprintf(name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));
  433 + dbf->rec = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_rec));
425 434 if (!dbf->rec)
426 435 goto err_out;
427 436  
428 437 /* debug feature area which records HBA (FSF and QDIO) conditions */
429   - sprintf(dbf_name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));
430   - dbf->hba = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_hba));
  438 + sprintf(name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));
  439 + dbf->hba = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_hba));
431 440 if (!dbf->hba)
432 441 goto err_out;
433 442  
434 443 /* debug feature area which records payload info */
435   - sprintf(dbf_name, "zfcp_%s_pay", dev_name(&adapter->ccw_device->dev));
436   - dbf->pay = zfcp_dbf_reg(dbf_name, 3, NULL,
437   - sizeof(struct zfcp_dbf_pay));
  444 + sprintf(name, "zfcp_%s_pay", dev_name(&adapter->ccw_device->dev));
  445 + dbf->pay = zfcp_dbf_reg(name, dbfsize * 2, sizeof(struct zfcp_dbf_pay));
438 446 if (!dbf->pay)
439 447 goto err_out;
440 448  
441 449 /* debug feature area which records SAN command failures and recovery */
442   - sprintf(dbf_name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));
443   - dbf->san = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_san));
  450 + sprintf(name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));
  451 + dbf->san = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_san));
444 452 if (!dbf->san)
445 453 goto err_out;
446 454  
447 455 /* debug feature area which records SCSI command failures and recovery */
448   - sprintf(dbf_name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));
449   - dbf->scsi = zfcp_dbf_reg(dbf_name, 3, NULL,
450   - sizeof(struct zfcp_dbf_scsi));
  456 + sprintf(name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));
  457 + dbf->scsi = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_scsi));
451 458 if (!dbf->scsi)
452 459 goto err_out;
453 460  
454 461 adapter->dbf = dbf;
455   - return 0;
456 462  
  463 + return 0;
457 464 err_out:
458   - zfcp_dbf_adapter_unregister(dbf);
  465 + zfcp_dbf_unregister(dbf);
459 466 return -ENOMEM;
460 467 }
461 468  
462 469 /**
463 470 * zfcp_adapter_debug_unregister - unregisters debug feature for an adapter
464   - * @dbf: pointer to dbf for which debug features should be unregistered
  471 + * @adapter: pointer to adapter for which debug features should be unregistered
465 472 */
466   -void zfcp_dbf_adapter_unregister(struct zfcp_dbf *dbf)
  473 +void zfcp_dbf_adapter_unregister(struct zfcp_adapter *adapter)
467 474 {
468   - if (!dbf)
469   - return;
470   - debug_unregister(dbf->scsi);
471   - debug_unregister(dbf->san);
472   - debug_unregister(dbf->hba);
473   - debug_unregister(dbf->pay);
474   - debug_unregister(dbf->rec);
475   - dbf->adapter->dbf = NULL;
476   - kfree(dbf);
  475 + struct zfcp_dbf *dbf = adapter->dbf;
  476 +
  477 + adapter->dbf = NULL;
  478 + zfcp_dbf_unregister(dbf);
477 479 }
drivers/s390/scsi/zfcp_dbf.h
Diff comments   View file @ ea4a3a6
... ... @@ -14,8 +14,6 @@
14 14 #include "zfcp_def.h"
15 15  
16 16 #define ZFCP_DBF_TAG_LEN 7
17   -#define ZFCP_DBF_TAG_SIZE 4
18   -#define ZFCP_DBF_ID_SIZE 7
19 17  
20 18 #define ZFCP_DBF_INVALID_LUN 0xFFFFFFFFFFFFFFFFull
21 19  
22 20  
23 21  
... ... @@ -233,13 +231,31 @@
233 231 * @data: unformatted data
234 232 */
235 233 struct zfcp_dbf_pay {
  234 + u8 counter;
236 235 char area[ZFCP_DBF_TAG_LEN];
237   - char counter;
238 236 u64 fsf_req_id;
239 237 #define ZFCP_DBF_PAY_MAX_REC 0x100
240 238 char data[ZFCP_DBF_PAY_MAX_REC];
241 239 } __packed;
242 240  
  241 +/**
  242 + * struct zfcp_dbf - main dbf trace structure
  243 + * @pay: reference to payload trace area
  244 + * @rec: reference to recovery trace area
  245 + * @hba: reference to hba trace area
  246 + * @san: reference to san trace area
  247 + * @scsi: reference to scsi trace area
  248 + * @pay_lock: lock protecting payload trace buffer
  249 + * @rec_lock: lock protecting recovery trace buffer
  250 + * @hba_lock: lock protecting hba trace buffer
  251 + * @san_lock: lock protecting san trace buffer
  252 + * @scsi_lock: lock protecting scsi trace buffer
  253 + * @pay_buf: pre-allocated buffer for payload
  254 + * @rec_buf: pre-allocated buffer for recovery
  255 + * @hba_buf: pre-allocated buffer for hba
  256 + * @san_buf: pre-allocated buffer for san
  257 + * @scsi_buf: pre-allocated buffer for scsi
  258 + */
243 259 struct zfcp_dbf {
244 260 debug_info_t *pay;
245 261 debug_info_t *rec;
246 262  
... ... @@ -251,12 +267,11 @@
251 267 spinlock_t hba_lock;
252 268 spinlock_t san_lock;
253 269 spinlock_t scsi_lock;
  270 + struct zfcp_dbf_pay pay_buf;
254 271 struct zfcp_dbf_rec rec_buf;
255 272 struct zfcp_dbf_hba hba_buf;
256 273 struct zfcp_dbf_san san_buf;
257 274 struct zfcp_dbf_scsi scsi_buf;
258   - struct zfcp_dbf_pay pay_buf;
259   - struct zfcp_adapter *adapter;
260 275 };
261 276  
262 277 static inline
drivers/s390/scsi/zfcp_erp.c
Diff comments   View file @ ea4a3a6
... ... @@ -236,7 +236,7 @@
236 236 static int zfcp_erp_action_enqueue(int want, struct zfcp_adapter *adapter,
237 237 struct zfcp_port *port,
238 238 struct scsi_device *sdev,
239   - char *id, void *ref, u32 act_status)
  239 + char *id, u32 act_status)
240 240 {
241 241 int retval = 1, need;
242 242 struct zfcp_erp_action *act;
... ... @@ -262,7 +262,7 @@
262 262 }
263 263  
264 264 static int _zfcp_erp_adapter_reopen(struct zfcp_adapter *adapter,
265   - int clear_mask, char *id, void *ref)
  265 + int clear_mask, char *id)
266 266 {
267 267 zfcp_erp_adapter_block(adapter, clear_mask);
268 268 zfcp_scsi_schedule_rports_block(adapter);
... ... @@ -274,7 +274,7 @@
274 274 return -EIO;
275 275 }
276 276 return zfcp_erp_action_enqueue(ZFCP_ERP_ACTION_REOPEN_ADAPTER,
277   - adapter, NULL, NULL, id, ref, 0);
  277 + adapter, NULL, NULL, id, 0);
278 278 }
279 279  
280 280 /**
281 281  
... ... @@ -282,10 +282,8 @@
282 282 * @adapter: Adapter to reopen.
283 283 * @clear: Status flags to clear.
284 284 * @id: Id for debug trace event.
285   - * @ref: Reference for debug trace event.
286 285 */
287   -void zfcp_erp_adapter_reopen(struct zfcp_adapter *adapter, int clear,
288   - char *id, void *ref)
  286 +void zfcp_erp_adapter_reopen(struct zfcp_adapter *adapter, int clear, char *id)
289 287 {
290 288 unsigned long flags;
291 289  
... ... @@ -298,7 +296,7 @@
298 296 ZFCP_STATUS_COMMON_ERP_FAILED);
299 297 else
300 298 zfcp_erp_action_enqueue(ZFCP_ERP_ACTION_REOPEN_ADAPTER, adapter,
301   - NULL, NULL, id, ref, 0);
  299 + NULL, NULL, id, 0);
302 300 write_unlock_irqrestore(&adapter->erp_lock, flags);
303 301 }
304 302  
305 303  
306 304  
... ... @@ -307,13 +305,12 @@
307 305 * @adapter: Adapter to shut down.
308 306 * @clear: Status flags to clear.
309 307 * @id: Id for debug trace event.
310   - * @ref: Reference for debug trace event.
311 308 */
312 309 void zfcp_erp_adapter_shutdown(struct zfcp_adapter *adapter, int clear,
313   - char *id, void *ref)
  310 + char *id)
314 311 {
315 312 int flags = ZFCP_STATUS_COMMON_RUNNING | ZFCP_STATUS_COMMON_ERP_FAILED;
316   - zfcp_erp_adapter_reopen(adapter, clear | flags, id, ref);
  313 + zfcp_erp_adapter_reopen(adapter, clear | flags, id);
317 314 }
318 315  
319 316 /**
320 317  
321 318  
... ... @@ -321,13 +318,11 @@
321 318 * @port: Port to shut down.
322 319 * @clear: Status flags to clear.
323 320 * @id: Id for debug trace event.
324   - * @ref: Reference for debug trace event.
325 321 */
326   -void zfcp_erp_port_shutdown(struct zfcp_port *port, int clear, char *id,
327   - void *ref)
  322 +void zfcp_erp_port_shutdown(struct zfcp_port *port, int clear, char *id)
328 323 {
329 324 int flags = ZFCP_STATUS_COMMON_RUNNING | ZFCP_STATUS_COMMON_ERP_FAILED;
330   - zfcp_erp_port_reopen(port, clear | flags, id, ref);
  325 + zfcp_erp_port_reopen(port, clear | flags, id);
331 326 }
332 327  
333 328 static void zfcp_erp_port_block(struct zfcp_port *port, int clear)
... ... @@ -336,8 +331,8 @@
336 331 ZFCP_STATUS_COMMON_UNBLOCKED | clear);
337 332 }
338 333  
339   -static void _zfcp_erp_port_forced_reopen(struct zfcp_port *port,
340   - int clear, char *id, void *ref)
  334 +static void _zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear,
  335 + char *id)
341 336 {
342 337 zfcp_erp_port_block(port, clear);
343 338 zfcp_scsi_schedule_rport_block(port);
344 339  
345 340  
346 341  
347 342  
348 343  
... ... @@ -346,28 +341,26 @@
346 341 return;
347 342  
348 343 zfcp_erp_action_enqueue(ZFCP_ERP_ACTION_REOPEN_PORT_FORCED,
349   - port->adapter, port, NULL, id, ref, 0);
  344 + port->adapter, port, NULL, id, 0);
350 345 }
351 346  
352 347 /**
353 348 * zfcp_erp_port_forced_reopen - Forced close of port and open again
354 349 * @port: Port to force close and to reopen.
  350 + * @clear: Status flags to clear.
355 351 * @id: Id for debug trace event.
356   - * @ref: Reference for debug trace event.
357 352 */
358   -void zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear, char *id,
359   - void *ref)
  353 +void zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear, char *id)
360 354 {
361 355 unsigned long flags;
362 356 struct zfcp_adapter *adapter = port->adapter;
363 357  
364 358 write_lock_irqsave(&adapter->erp_lock, flags);
365   - _zfcp_erp_port_forced_reopen(port, clear, id, ref);
  359 + _zfcp_erp_port_forced_reopen(port, clear, id);
366 360 write_unlock_irqrestore(&adapter->erp_lock, flags);
367 361 }
368 362  
369   -static int _zfcp_erp_port_reopen(struct zfcp_port *port, int clear, char *id,
370   - void *ref)
  363 +static int _zfcp_erp_port_reopen(struct zfcp_port *port, int clear, char *id)
371 364 {
372 365 zfcp_erp_port_block(port, clear);
373 366 zfcp_scsi_schedule_rport_block(port);
374 367  
375 368  
376 369  
... ... @@ -379,24 +372,25 @@
379 372 }
380 373  
381 374 return zfcp_erp_action_enqueue(ZFCP_ERP_ACTION_REOPEN_PORT,
382   - port->adapter, port, NULL, id, ref, 0);
  375 + port->adapter, port, NULL, id, 0);
383 376 }
384 377  
385 378 /**
386 379 * zfcp_erp_port_reopen - trigger remote port recovery
387 380 * @port: port to recover
388 381 * @clear_mask: flags in port status to be cleared
  382 + * @id: Id for debug trace event.
389 383 *
390 384 * Returns 0 if recovery has been triggered, < 0 if not.
391 385 */
392   -int zfcp_erp_port_reopen(struct zfcp_port *port, int clear, char *id, void *ref)
  386 +int zfcp_erp_port_reopen(struct zfcp_port *port, int clear, char *id)
393 387 {
394 388 int retval;
395 389 unsigned long flags;
396 390 struct zfcp_adapter *adapter = port->adapter;
397 391  
398 392 write_lock_irqsave(&adapter->erp_lock, flags);
399   - retval = _zfcp_erp_port_reopen(port, clear, id, ref);
  393 + retval = _zfcp_erp_port_reopen(port, clear, id);
400 394 write_unlock_irqrestore(&adapter->erp_lock, flags);
401 395  
402 396 return retval;
... ... @@ -409,7 +403,7 @@
409 403 }
410 404  
411 405 static void _zfcp_erp_lun_reopen(struct scsi_device *sdev, int clear, char *id,
412   - void *ref, u32 act_status)
  406 + u32 act_status)
413 407 {
414 408 struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
415 409 struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
416 410  
417 411  
... ... @@ -420,17 +414,18 @@
420 414 return;
421 415  
422 416 zfcp_erp_action_enqueue(ZFCP_ERP_ACTION_REOPEN_LUN, adapter,
423   - zfcp_sdev->port, sdev, id, ref, act_status);
  417 + zfcp_sdev->port, sdev, id, act_status);
424 418 }
425 419  
426 420 /**
427 421 * zfcp_erp_lun_reopen - initiate reopen of a LUN
428 422 * @sdev: SCSI device / LUN to be reopened
429 423 * @clear_mask: specifies flags in LUN status to be cleared
  424 + * @id: Id for debug trace event.
  425 + *
430 426 * Return: 0 on success, < 0 on error
431 427 */
432   -void zfcp_erp_lun_reopen(struct scsi_device *sdev, int clear, char *id,
433   - void *ref)
  428 +void zfcp_erp_lun_reopen(struct scsi_device *sdev, int clear, char *id)
434 429 {
435 430 unsigned long flags;
436 431 struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
... ... @@ -438,7 +433,7 @@
438 433 struct zfcp_adapter *adapter = port->adapter;
439 434  
440 435 write_lock_irqsave(&adapter->erp_lock, flags);
441   - _zfcp_erp_lun_reopen(sdev, clear, id, ref, 0);
  436 + _zfcp_erp_lun_reopen(sdev, clear, id, 0);
442 437 write_unlock_irqrestore(&adapter->erp_lock, flags);
443 438 }
444 439  
445 440  
446 441  
... ... @@ -447,13 +442,11 @@
447 442 * @sdev: SCSI device / LUN to shut down.
448 443 * @clear: Status flags to clear.
449 444 * @id: Id for debug trace event.
450   - * @ref: Reference for debug trace event.
451 445 */
452   -void zfcp_erp_lun_shutdown(struct scsi_device *sdev, int clear, char *id,
453   - void *ref)
  446 +void zfcp_erp_lun_shutdown(struct scsi_device *sdev, int clear, char *id)
454 447 {
455 448 int flags = ZFCP_STATUS_COMMON_RUNNING | ZFCP_STATUS_COMMON_ERP_FAILED;
456   - zfcp_erp_lun_reopen(sdev, clear | flags, id, ref);
  449 + zfcp_erp_lun_reopen(sdev, clear | flags, id);
457 450 }
458 451  
459 452 /**
... ... @@ -475,7 +468,7 @@
475 468 int clear = ZFCP_STATUS_COMMON_RUNNING | ZFCP_STATUS_COMMON_ERP_FAILED;
476 469  
477 470 write_lock_irqsave(&adapter->erp_lock, flags);
478   - _zfcp_erp_lun_reopen(sdev, clear, id, NULL, ZFCP_STATUS_ERP_NO_REF);
  471 + _zfcp_erp_lun_reopen(sdev, clear, id, ZFCP_STATUS_ERP_NO_REF);
479 472 write_unlock_irqrestore(&adapter->erp_lock, flags);
480 473  
481 474 zfcp_erp_wait(adapter);
482 475  
483 476  
484 477  
485 478  
486 479  
487 480  
488 481  
... ... @@ -584,40 +577,40 @@
584 577 }
585 578  
586 579 static void _zfcp_erp_port_reopen_all(struct zfcp_adapter *adapter,
587   - int clear, char *id, void *ref)
  580 + int clear, char *id)
588 581 {
589 582 struct zfcp_port *port;
590 583  
591 584 read_lock(&adapter->port_list_lock);
592 585 list_for_each_entry(port, &adapter->port_list, list)
593   - _zfcp_erp_port_reopen(port, clear, id, ref);
  586 + _zfcp_erp_port_reopen(port, clear, id);
594 587 read_unlock(&adapter->port_list_lock);
595 588 }
596 589  
597 590 static void _zfcp_erp_lun_reopen_all(struct zfcp_port *port, int clear,
598   - char *id, void *ref)
  591 + char *id)
599 592 {
600 593 struct scsi_device *sdev;
601 594  
602 595 shost_for_each_device(sdev, port->adapter->scsi_host)
603 596 if (sdev_to_zfcp(sdev)->port == port)
604   - _zfcp_erp_lun_reopen(sdev, clear, id, ref, 0);
  597 + _zfcp_erp_lun_reopen(sdev, clear, id, 0);
605 598 }
606 599  
607 600 static void zfcp_erp_strategy_followup_failed(struct zfcp_erp_action *act)
608 601 {
609 602 switch (act->action) {
610 603 case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
611   - _zfcp_erp_adapter_reopen(act->adapter, 0, "ersff_1", NULL);
  604 + _zfcp_erp_adapter_reopen(act->adapter, 0, "ersff_1");
612 605 break;
613 606 case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
614   - _zfcp_erp_port_forced_reopen(act->port, 0, "ersff_2", NULL);
  607 + _zfcp_erp_port_forced_reopen(act->port, 0, "ersff_2");
615 608 break;
616 609 case ZFCP_ERP_ACTION_REOPEN_PORT:
617   - _zfcp_erp_port_reopen(act->port, 0, "ersff_3", NULL);
  610 + _zfcp_erp_port_reopen(act->port, 0, "ersff_3");
618 611 break;
619 612 case ZFCP_ERP_ACTION_REOPEN_LUN:
620   - _zfcp_erp_lun_reopen(act->sdev, 0, "ersff_4", NULL, 0);
  613 + _zfcp_erp_lun_reopen(act->sdev, 0, "ersff_4", 0);
621 614 break;
622 615 }
623 616 }
624 617  
625 618  
... ... @@ -626,13 +619,13 @@
626 619 {
627 620 switch (act->action) {
628 621 case ZFCP_ERP_ACTION_REOPEN_ADAPTER:
629   - _zfcp_erp_port_reopen_all(act->adapter, 0, "ersfs_1", NULL);
  622 + _zfcp_erp_port_reopen_all(act->adapter, 0, "ersfs_1");
630 623 break;
631 624 case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
632   - _zfcp_erp_port_reopen(act->port, 0, "ersfs_2", NULL);
  625 + _zfcp_erp_port_reopen(act->port, 0, "ersfs_2");
633 626 break;
634 627 case ZFCP_ERP_ACTION_REOPEN_PORT:
635   - _zfcp_erp_lun_reopen_all(act->port, 0, "ersfs_3", NULL);
  628 + _zfcp_erp_lun_reopen_all(act->port, 0, "ersfs_3");
636 629 break;
637 630 }
638 631 }
... ... @@ -669,7 +662,7 @@
669 662 adapter->peer_d_id);
670 663 if (IS_ERR(port)) /* error or port already attached */
671 664 return;
672   - _zfcp_erp_port_reopen(port, 0, "ereptp1", NULL);
  665 + _zfcp_erp_port_reopen(port, 0, "ereptp1");
673 666 }
674 667  
675 668 static int zfcp_erp_adapter_strat_fsf_xconf(struct zfcp_erp_action *erp_action)
... ... @@ -1163,7 +1156,7 @@
1163 1156 if (zfcp_erp_strat_change_det(&adapter->status, erp_status)) {
1164 1157 _zfcp_erp_adapter_reopen(adapter,
1165 1158 ZFCP_STATUS_COMMON_ERP_FAILED,
1166   - "ersscg1", NULL);
  1159 + "ersscg1");
1167 1160 return ZFCP_ERP_EXIT;
1168 1161 }
1169 1162 break;
... ... @@ -1173,7 +1166,7 @@
1173 1166 if (zfcp_erp_strat_change_det(&port->status, erp_status)) {
1174 1167 _zfcp_erp_port_reopen(port,
1175 1168 ZFCP_STATUS_COMMON_ERP_FAILED,
1176   - "ersscg2", NULL);
  1169 + "ersscg2");
1177 1170 return ZFCP_ERP_EXIT;
1178 1171 }
1179 1172 break;
... ... @@ -1183,7 +1176,7 @@
1183 1176 if (zfcp_erp_strat_change_det(&zfcp_sdev->status, erp_status)) {
1184 1177 _zfcp_erp_lun_reopen(sdev,
1185 1178 ZFCP_STATUS_COMMON_ERP_FAILED,
1186   - "ersscg3", NULL, 0);
  1179 + "ersscg3", 0);
1187 1180 return ZFCP_ERP_EXIT;
1188 1181 }
1189 1182 break;
... ... @@ -1310,7 +1303,7 @@
1310 1303 erp_action->status |= ZFCP_STATUS_ERP_LOWMEM;
1311 1304 }
1312 1305 if (adapter->erp_total_count == adapter->erp_low_mem_count)
1313   - _zfcp_erp_adapter_reopen(adapter, 0, "erstgy1", NULL);
  1306 + _zfcp_erp_adapter_reopen(adapter, 0, "erstgy1");
1314 1307 else {
1315 1308 zfcp_erp_strategy_memwait(erp_action);
1316 1309 retval = ZFCP_ERP_CONTINUES;
drivers/s390/scsi/zfcp_ext.h
Diff comments   View file @ ea4a3a6
... ... @@ -45,7 +45,7 @@
45 45  
46 46 /* zfcp_dbf.c */
47 47 extern int zfcp_dbf_adapter_register(struct zfcp_adapter *);
48   -extern void zfcp_dbf_adapter_unregister(struct zfcp_dbf *);
  48 +extern void zfcp_dbf_adapter_unregister(struct zfcp_adapter *);
49 49 extern void zfcp_dbf_rec_trig(char *, struct zfcp_adapter *,
50 50 struct zfcp_port *, struct scsi_device *, u8, u8);
51 51 extern void zfcp_dbf_rec_run(char *, struct zfcp_erp_action *);
52 52  
53 53  
... ... @@ -61,19 +61,17 @@
61 61 /* zfcp_erp.c */
62 62 extern void zfcp_erp_set_adapter_status(struct zfcp_adapter *, u32);
63 63 extern void zfcp_erp_clear_adapter_status(struct zfcp_adapter *, u32);
64   -extern void zfcp_erp_adapter_reopen(struct zfcp_adapter *, int, char *, void *);
65   -extern void zfcp_erp_adapter_shutdown(struct zfcp_adapter *, int, char *,
66   - void *);
  64 +extern void zfcp_erp_adapter_reopen(struct zfcp_adapter *, int, char *);
  65 +extern void zfcp_erp_adapter_shutdown(struct zfcp_adapter *, int, char *);
67 66 extern void zfcp_erp_set_port_status(struct zfcp_port *, u32);
68 67 extern void zfcp_erp_clear_port_status(struct zfcp_port *, u32);
69   -extern int zfcp_erp_port_reopen(struct zfcp_port *, int, char *, void *);
70   -extern void zfcp_erp_port_shutdown(struct zfcp_port *, int, char *, void *);
71   -extern void zfcp_erp_port_forced_reopen(struct zfcp_port *, int, char *,
72   - void *);
  68 +extern int zfcp_erp_port_reopen(struct zfcp_port *, int, char *);
  69 +extern void zfcp_erp_port_shutdown(struct zfcp_port *, int, char *);
  70 +extern void zfcp_erp_port_forced_reopen(struct zfcp_port *, int, char *);
73 71 extern void zfcp_erp_set_lun_status(struct scsi_device *, u32);
74 72 extern void zfcp_erp_clear_lun_status(struct scsi_device *, u32);
75   -extern void zfcp_erp_lun_reopen(struct scsi_device *, int, char *, void *);
76   -extern void zfcp_erp_lun_shutdown(struct scsi_device *, int, char *, void *);
  73 +extern void zfcp_erp_lun_reopen(struct scsi_device *, int, char *);
  74 +extern void zfcp_erp_lun_shutdown(struct scsi_device *, int, char *);
77 75 extern void zfcp_erp_lun_shutdown_wait(struct scsi_device *, char *);
78 76 extern int zfcp_erp_thread_setup(struct zfcp_adapter *);
79 77 extern void zfcp_erp_thread_kill(struct zfcp_adapter *);
drivers/s390/scsi/zfcp_fc.c
Diff comments   View file @ ea4a3a6
... ... @@ -174,7 +174,7 @@
174 174 if (!port->d_id)
175 175 zfcp_erp_port_reopen(port,
176 176 ZFCP_STATUS_COMMON_ERP_FAILED,
177   - "fcrscn1", NULL);
  177 + "fcrscn1");
178 178 }
179 179 read_unlock_irqrestore(&adapter->port_list_lock, flags);
180 180 }
... ... @@ -215,7 +215,7 @@
215 215 read_lock_irqsave(&adapter->port_list_lock, flags);
216 216 list_for_each_entry(port, &adapter->port_list, list)
217 217 if (port->wwpn == wwpn) {
218   - zfcp_erp_port_forced_reopen(port, 0, "fciwwp1", req);
  218 + zfcp_erp_port_forced_reopen(port, 0, "fciwwp1");
219 219 break;
220 220 }
221 221 read_unlock_irqrestore(&adapter->port_list_lock, flags);
... ... @@ -360,7 +360,7 @@
360 360 ret = zfcp_fc_ns_gid_pn(port);
361 361 if (ret) {
362 362 /* could not issue gid_pn for some reason */
363   - zfcp_erp_adapter_reopen(port->adapter, 0, "fcgpn_1", NULL);
  363 + zfcp_erp_adapter_reopen(port->adapter, 0, "fcgpn_1");
364 364 goto out;
365 365 }
366 366  
... ... @@ -369,7 +369,7 @@
369 369 goto out;
370 370 }
371 371  
372   - zfcp_erp_port_reopen(port, 0, "fcgpn_3", NULL);
  372 + zfcp_erp_port_reopen(port, 0, "fcgpn_3");
373 373 out:
374 374 put_device(&port->dev);
375 375 }
... ... @@ -426,7 +426,7 @@
426 426 if (adisc->els.status) {
427 427 /* request rejected or timed out */
428 428 zfcp_erp_port_forced_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
429   - "fcadh_1", NULL);
  429 + "fcadh_1");
430 430 goto out;
431 431 }
432 432  
... ... @@ -436,7 +436,7 @@
436 436 if ((port->wwpn != adisc_resp->adisc_wwpn) ||
437 437 !(atomic_read(&port->status) & ZFCP_STATUS_COMMON_OPEN)) {
438 438 zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
439   - "fcadh_2", NULL);
  439 + "fcadh_2");
440 440 goto out;
441 441 }
442 442  
... ... @@ -507,7 +507,7 @@
507 507  
508 508 /* send of ADISC was not possible */
509 509 atomic_clear_mask(ZFCP_STATUS_PORT_LINK_TEST, &port->status);
510   - zfcp_erp_port_forced_reopen(port, 0, "fcltwk1", NULL);
  510 + zfcp_erp_port_forced_reopen(port, 0, "fcltwk1");
511 511  
512 512 out:
513 513 put_device(&port->dev);
... ... @@ -659,7 +659,7 @@
659 659 port = zfcp_port_enqueue(adapter, acc->fp_wwpn,
660 660 ZFCP_STATUS_COMMON_NOESC, d_id);
661 661 if (!IS_ERR(port))
662   - zfcp_erp_port_reopen(port, 0, "fcegpf1", NULL);
  662 + zfcp_erp_port_reopen(port, 0, "fcegpf1");
663 663 else if (PTR_ERR(port) != -EEXIST)
664 664 ret = PTR_ERR(port);
665 665 }
... ... @@ -671,7 +671,7 @@
671 671 write_unlock_irqrestore(&adapter->port_list_lock, flags);
672 672  
673 673 list_for_each_entry_safe(port, tmp, &remove_lh, list) {
674   - zfcp_erp_port_shutdown(port, 0, "fcegpf2", NULL);
  674 + zfcp_erp_port_shutdown(port, 0, "fcegpf2");
675 675 zfcp_device_unregister(&port->dev, &zfcp_sysfs_port_attrs);
676 676 }
677 677  
drivers/s390/scsi/zfcp_fsf.c
Diff comments   View file @ ea4a3a6
... ... @@ -23,7 +23,7 @@
23 23 struct zfcp_adapter *adapter = (struct zfcp_adapter *) data;
24 24 zfcp_qdio_siosl(adapter);
25 25 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
26   - "fsrth_1", NULL);
  26 + "fsrth_1");
27 27 }
28 28  
29 29 static void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req,
... ... @@ -65,7 +65,7 @@
65 65 {
66 66 dev_err(&req->adapter->ccw_device->dev, "FCP device not "
67 67 "operational because of an unsupported FC class\n");
68   - zfcp_erp_adapter_shutdown(req->adapter, 0, "fscns_1", req);
  68 + zfcp_erp_adapter_shutdown(req->adapter, 0, "fscns_1");
69 69 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
70 70 }
71 71  
... ... @@ -98,7 +98,7 @@
98 98 read_lock_irqsave(&adapter->port_list_lock, flags);
99 99 list_for_each_entry(port, &adapter->port_list, list)
100 100 if (port->d_id == d_id) {
101   - zfcp_erp_port_reopen(port, 0, "fssrpc1", req);
  101 + zfcp_erp_port_reopen(port, 0, "fssrpc1");
102 102 break;
103 103 }
104 104 read_unlock_irqrestore(&adapter->port_list_lock, flags);
... ... @@ -247,7 +247,7 @@
247 247 zfcp_erp_adapter_reopen(adapter,
248 248 ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
249 249 ZFCP_STATUS_COMMON_ERP_FAILED,
250   - "fssrh_2", req);
  250 + "fssrh_2");
251 251 zfcp_fc_enqueue_event(adapter, FCH_EVT_LINKUP, 0);
252 252  
253 253 break;
... ... @@ -287,7 +287,7 @@
287 287 "The FCP adapter reported a problem "
288 288 "that cannot be recovered\n");
289 289 zfcp_qdio_siosl(req->adapter);
290   - zfcp_erp_adapter_shutdown(req->adapter, 0, "fsfsqe1", req);
  290 + zfcp_erp_adapter_shutdown(req->adapter, 0, "fsfsqe1");
291 291 break;
292 292 }
293 293 /* all non-return stats set FSFREQ_ERROR*/
... ... @@ -304,7 +304,7 @@
304 304 dev_err(&req->adapter->ccw_device->dev,
305 305 "The FCP adapter does not recognize the command 0x%x\n",
306 306 req->qtcb->header.fsf_command);
307   - zfcp_erp_adapter_shutdown(req->adapter, 0, "fsfse_1", req);
  307 + zfcp_erp_adapter_shutdown(req->adapter, 0, "fsfse_1");
308 308 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
309 309 break;
310 310 case FSF_ADAPTER_STATUS_AVAILABLE:
311 311  
312 312  
... ... @@ -335,17 +335,17 @@
335 335 "QTCB version 0x%x not supported by FCP adapter "
336 336 "(0x%x to 0x%x)\n", FSF_QTCB_CURRENT_VERSION,
337 337 psq->word[0], psq->word[1]);
338   - zfcp_erp_adapter_shutdown(adapter, 0, "fspse_1", req);
  338 + zfcp_erp_adapter_shutdown(adapter, 0, "fspse_1");
339 339 break;
340 340 case FSF_PROT_ERROR_STATE:
341 341 case FSF_PROT_SEQ_NUMB_ERROR:
342   - zfcp_erp_adapter_reopen(adapter, 0, "fspse_2", req);
  342 + zfcp_erp_adapter_reopen(adapter, 0, "fspse_2");
343 343 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
344 344 break;
345 345 case FSF_PROT_UNSUPP_QTCB_TYPE:
346 346 dev_err(&adapter->ccw_device->dev,
347 347 "The QTCB type is not supported by the FCP adapter\n");
348   - zfcp_erp_adapter_shutdown(adapter, 0, "fspse_3", req);
  348 + zfcp_erp_adapter_shutdown(adapter, 0, "fspse_3");
349 349 break;
350 350 case FSF_PROT_HOST_CONNECTION_INITIALIZING:
351 351 atomic_set_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
352 352  
... ... @@ -355,12 +355,12 @@
355 355 dev_err(&adapter->ccw_device->dev,
356 356 "0x%Lx is an ambiguous request identifier\n",
357 357 (unsigned long long)qtcb->bottom.support.req_handle);
358   - zfcp_erp_adapter_shutdown(adapter, 0, "fspse_4", req);
  358 + zfcp_erp_adapter_shutdown(adapter, 0, "fspse_4");
359 359 break;
360 360 case FSF_PROT_LINK_DOWN:
361 361 zfcp_fsf_link_down_info_eval(req, &psq->link_down_info);
362 362 /* go through reopen to flush pending requests */
363   - zfcp_erp_adapter_reopen(adapter, 0, "fspse_6", req);
  363 + zfcp_erp_adapter_reopen(adapter, 0, "fspse_6");
364 364 break;
365 365 case FSF_PROT_REEST_QUEUE:
366 366 /* All ports should be marked as ready to run again */
367 367  
... ... @@ -369,14 +369,14 @@
369 369 zfcp_erp_adapter_reopen(adapter,
370 370 ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
371 371 ZFCP_STATUS_COMMON_ERP_FAILED,
372   - "fspse_8", req);
  372 + "fspse_8");
373 373 break;
374 374 default:
375 375 dev_err(&adapter->ccw_device->dev,
376 376 "0x%x is not a valid transfer protocol status\n",
377 377 qtcb->prefix.prot_status);
378 378 zfcp_qdio_siosl(adapter);
379   - zfcp_erp_adapter_shutdown(adapter, 0, "fspse_9", req);
  379 + zfcp_erp_adapter_shutdown(adapter, 0, "fspse_9");
380 380 }
381 381 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
382 382 }
... ... @@ -482,7 +482,7 @@
482 482 dev_err(&adapter->ccw_device->dev,
483 483 "Unknown or unsupported arbitrated loop "
484 484 "fibre channel topology detected\n");
485   - zfcp_erp_adapter_shutdown(adapter, 0, "fsece_1", req);
  485 + zfcp_erp_adapter_shutdown(adapter, 0, "fsece_1");
486 486 return -EIO;
487 487 }
488 488  
... ... @@ -518,7 +518,7 @@
518 518 "FCP adapter maximum QTCB size (%d bytes) "
519 519 "is too small\n",
520 520 bottom->max_qtcb_size);
521   - zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh1", req);
  521 + zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh1");
522 522 return;
523 523 }
524 524 atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
... ... @@ -536,7 +536,7 @@
536 536 &qtcb->header.fsf_status_qual.link_down_info);
537 537 break;
538 538 default:
539   - zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh3", req);
  539 + zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh3");
540 540 return;
541 541 }
542 542  
543 543  
... ... @@ -552,14 +552,14 @@
552 552 dev_err(&adapter->ccw_device->dev,
553 553 "The FCP adapter only supports newer "
554 554 "control block versions\n");
555   - zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh4", req);
  555 + zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh4");
556 556 return;
557 557 }
558 558 if (FSF_QTCB_CURRENT_VERSION > bottom->high_qtcb_version) {
559 559 dev_err(&adapter->ccw_device->dev,
560 560 "The FCP adapter only supports older "
561 561 "control block versions\n");
562   - zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh5", req);
  562 + zfcp_erp_adapter_shutdown(adapter, 0, "fsecdh5");
563 563 }
564 564 }
565 565  
... ... @@ -700,7 +700,7 @@
700 700 del_timer(&req->timer);
701 701 /* lookup request again, list might have changed */
702 702 zfcp_reqlist_find_rm(adapter->req_list, req_id);
703   - zfcp_erp_adapter_reopen(adapter, 0, "fsrs__1", req);
  703 + zfcp_erp_adapter_reopen(adapter, 0, "fsrs__1");
704 704 return -EIO;
705 705 }
706 706  
707 707  
... ... @@ -777,14 +777,13 @@
777 777 case FSF_PORT_HANDLE_NOT_VALID:
778 778 if (fsq->word[0] == fsq->word[1]) {
779 779 zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0,
780   - "fsafch1", req);
  780 + "fsafch1");
781 781 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
782 782 }
783 783 break;
784 784 case FSF_LUN_HANDLE_NOT_VALID:
785 785 if (fsq->word[0] == fsq->word[1]) {
786   - zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fsafch2",
787   - req);
  786 + zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fsafch2");
788 787 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
789 788 }
790 789 break;
791 790  
... ... @@ -795,14 +794,13 @@
795 794 zfcp_erp_set_port_status(zfcp_sdev->port,
796 795 ZFCP_STATUS_COMMON_ACCESS_BOXED);
797 796 zfcp_erp_port_reopen(zfcp_sdev->port,
798   - ZFCP_STATUS_COMMON_ERP_FAILED, "fsafch3",
799   - req);
  797 + ZFCP_STATUS_COMMON_ERP_FAILED, "fsafch3");
800 798 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
801 799 break;
802 800 case FSF_LUN_BOXED:
803 801 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ACCESS_BOXED);
804 802 zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED,
805   - "fsafch4", req);
  803 + "fsafch4");
806 804 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
807 805 break;
808 806 case FSF_ADAPTER_STATUS_AVAILABLE:
... ... @@ -903,7 +901,7 @@
903 901 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
904 902 break;
905 903 case FSF_PORT_HANDLE_NOT_VALID:
906   - zfcp_erp_adapter_reopen(adapter, 0, "fsscth1", req);
  904 + zfcp_erp_adapter_reopen(adapter, 0, "fsscth1");
907 905 /* fall through */
908 906 case FSF_GENERIC_COMMAND_REJECTED:
909 907 case FSF_PAYLOAD_SIZE_MISMATCH:
... ... @@ -1449,7 +1447,7 @@
1449 1447  
1450 1448 switch (req->qtcb->header.fsf_status) {
1451 1449 case FSF_PORT_HANDLE_NOT_VALID:
1452   - zfcp_erp_adapter_reopen(port->adapter, 0, "fscph_1", req);
  1450 + zfcp_erp_adapter_reopen(port->adapter, 0, "fscph_1");
1453 1451 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1454 1452 break;
1455 1453 case FSF_ADAPTER_STATUS_AVAILABLE:
... ... @@ -1581,7 +1579,7 @@
1581 1579  
1582 1580 if (req->qtcb->header.fsf_status == FSF_PORT_HANDLE_NOT_VALID) {
1583 1581 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1584   - zfcp_erp_adapter_reopen(wka_port->adapter, 0, "fscwph1", req);
  1582 + zfcp_erp_adapter_reopen(wka_port->adapter, 0, "fscwph1");
1585 1583 }
1586 1584  
1587 1585 wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE;
... ... @@ -1639,7 +1637,7 @@
1639 1637  
1640 1638 switch (header->fsf_status) {
1641 1639 case FSF_PORT_HANDLE_NOT_VALID:
1642   - zfcp_erp_adapter_reopen(port->adapter, 0, "fscpph1", req);
  1640 + zfcp_erp_adapter_reopen(port->adapter, 0, "fscpph1");
1643 1641 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1644 1642 break;
1645 1643 case FSF_ACCESS_DENIED:
... ... @@ -1655,7 +1653,7 @@
1655 1653 &sdev_to_zfcp(sdev)->status);
1656 1654 zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_ACCESS_BOXED);
1657 1655 zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
1658   - "fscpph2", req);
  1656 + "fscpph2");
1659 1657 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1660 1658 break;
1661 1659 case FSF_ADAPTER_STATUS_AVAILABLE:
... ... @@ -1744,7 +1742,7 @@
1744 1742 switch (header->fsf_status) {
1745 1743  
1746 1744 case FSF_PORT_HANDLE_NOT_VALID:
1747   - zfcp_erp_adapter_reopen(adapter, 0, "fsouh_1", req);
  1745 + zfcp_erp_adapter_reopen(adapter, 0, "fsouh_1");
1748 1746 /* fall through */
1749 1747 case FSF_LUN_ALREADY_OPEN:
1750 1748 break;
... ... @@ -1756,8 +1754,7 @@
1756 1754 zfcp_erp_set_port_status(zfcp_sdev->port,
1757 1755 ZFCP_STATUS_COMMON_ACCESS_BOXED);
1758 1756 zfcp_erp_port_reopen(zfcp_sdev->port,
1759   - ZFCP_STATUS_COMMON_ERP_FAILED, "fsouh_2",
1760   - req);
  1757 + ZFCP_STATUS_COMMON_ERP_FAILED, "fsouh_2");
1761 1758 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1762 1759 break;
1763 1760 case FSF_LUN_SHARING_VIOLATION:
1764 1761  
1765 1762  
... ... @@ -1853,20 +1850,18 @@
1853 1850  
1854 1851 switch (req->qtcb->header.fsf_status) {
1855 1852 case FSF_PORT_HANDLE_NOT_VALID:
1856   - zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fscuh_1",
1857   - req);
  1853 + zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fscuh_1");
1858 1854 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1859 1855 break;
1860 1856 case FSF_LUN_HANDLE_NOT_VALID:
1861   - zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fscuh_2", req);
  1857 + zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fscuh_2");
1862 1858 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1863 1859 break;
1864 1860 case FSF_PORT_BOXED:
1865 1861 zfcp_erp_set_port_status(zfcp_sdev->port,
1866 1862 ZFCP_STATUS_COMMON_ACCESS_BOXED);
1867 1863 zfcp_erp_port_reopen(zfcp_sdev->port,
1868   - ZFCP_STATUS_COMMON_ERP_FAILED, "fscuh_3",
1869   - req);
  1864 + ZFCP_STATUS_COMMON_ERP_FAILED, "fscuh_3");
1870 1865 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
1871 1866 break;
1872 1867 case FSF_ADAPTER_STATUS_AVAILABLE:
1873 1868  
... ... @@ -2003,13 +1998,12 @@
2003 1998 switch (header->fsf_status) {
2004 1999 case FSF_HANDLE_MISMATCH:
2005 2000 case FSF_PORT_HANDLE_NOT_VALID:
2006   - zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fssfch1",
2007   - req);
  2001 + zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fssfch1");
2008 2002 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2009 2003 break;
2010 2004 case FSF_FCPLUN_NOT_VALID:
2011 2005 case FSF_LUN_HANDLE_NOT_VALID:
2012   - zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fssfch2", req);
  2006 + zfcp_erp_port_reopen(zfcp_sdev->port, 0, "fssfch2");
2013 2007 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2014 2008 break;
2015 2009 case FSF_SERVICE_CLASS_NOT_SUPPORTED:
... ... @@ -2027,7 +2021,7 @@
2027 2021 (unsigned long long)zfcp_scsi_dev_lun(sdev),
2028 2022 (unsigned long long)zfcp_sdev->port->wwpn);
2029 2023 zfcp_erp_adapter_shutdown(zfcp_sdev->port->adapter, 0,
2030   - "fssfch3", req);
  2024 + "fssfch3");
2031 2025 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2032 2026 break;
2033 2027 case FSF_CMND_LENGTH_NOT_VALID:
2034 2028  
2035 2029  
... ... @@ -2038,21 +2032,20 @@
2038 2032 (unsigned long long)zfcp_scsi_dev_lun(sdev),
2039 2033 (unsigned long long)zfcp_sdev->port->wwpn);
2040 2034 zfcp_erp_adapter_shutdown(zfcp_sdev->port->adapter, 0,
2041   - "fssfch4", req);
  2035 + "fssfch4");
2042 2036 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2043 2037 break;
2044 2038 case FSF_PORT_BOXED:
2045 2039 zfcp_erp_set_port_status(zfcp_sdev->port,
2046 2040 ZFCP_STATUS_COMMON_ACCESS_BOXED);
2047 2041 zfcp_erp_port_reopen(zfcp_sdev->port,
2048   - ZFCP_STATUS_COMMON_ERP_FAILED, "fssfch5",
2049   - req);
  2042 + ZFCP_STATUS_COMMON_ERP_FAILED, "fssfch5");
2050 2043 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2051 2044 break;
2052 2045 case FSF_LUN_BOXED:
2053 2046 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ACCESS_BOXED);
2054 2047 zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED,
2055   - "fssfch6", req);
  2048 + "fssfch6");
2056 2049 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
2057 2050 break;
2058 2051 case FSF_ADAPTER_STATUS_AVAILABLE:
drivers/s390/scsi/zfcp_qdio.c
Diff comments   View file @ ea4a3a6
... ... @@ -41,7 +41,7 @@
41 41 zfcp_qdio_siosl(adapter);
42 42 zfcp_erp_adapter_reopen(adapter,
43 43 ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
44   - ZFCP_STATUS_COMMON_ERP_FAILED, id, NULL);
  44 + ZFCP_STATUS_COMMON_ERP_FAILED, id);
45 45 }
46 46  
47 47 static void zfcp_qdio_zero_sbals(struct qdio_buffer *sbal[], int first, int cnt)
... ... @@ -114,7 +114,7 @@
114 114 * put SBALs back to response queue
115 115 */
116 116 if (do_QDIO(cdev, QDIO_FLAG_SYNC_INPUT, 0, idx, count))
117   - zfcp_erp_adapter_reopen(qdio->adapter, 0, "qdires2", NULL);
  117 + zfcp_erp_adapter_reopen(qdio->adapter, 0, "qdires2");
118 118 }
119 119  
120 120 static struct qdio_buffer_element *
... ... @@ -234,7 +234,7 @@
234 234 if (!ret) {
235 235 atomic_inc(&qdio->req_q_full);
236 236 /* assume hanging outbound queue, try queue recovery */
237   - zfcp_erp_adapter_reopen(qdio->adapter, 0, "qdsbg_1", NULL);
  237 + zfcp_erp_adapter_reopen(qdio->adapter, 0, "qdsbg_1");
238 238 }
239 239  
240 240 spin_lock_irq(&qdio->req_q_lock);
drivers/s390/scsi/zfcp_scsi.c
Diff comments   View file @ ea4a3a6
... ... @@ -154,7 +154,7 @@
154 154 spin_lock_init(&zfcp_sdev->latencies.lock);
155 155  
156 156 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_RUNNING);
157   - zfcp_erp_lun_reopen(sdev, 0, "scsla_1", NULL);
  157 + zfcp_erp_lun_reopen(sdev, 0, "scsla_1");
158 158 zfcp_erp_wait(port->adapter);
159 159  
160 160 return 0;
... ... @@ -278,7 +278,7 @@
278 278 struct zfcp_adapter *adapter = zfcp_sdev->port->adapter;
279 279 int ret;
280 280  
281   - zfcp_erp_adapter_reopen(adapter, 0, "schrh_1", scpnt);
  281 + zfcp_erp_adapter_reopen(adapter, 0, "schrh_1");
282 282 zfcp_erp_wait(adapter);
283 283 ret = fc_block_scsi_eh(scpnt);
284 284 if (ret)
... ... @@ -516,7 +516,7 @@
516 516 port = zfcp_get_port_by_wwpn(adapter, rport->port_name);
517 517  
518 518 if (port) {
519   - zfcp_erp_port_forced_reopen(port, 0, "sctrpi1", NULL);
  519 + zfcp_erp_port_forced_reopen(port, 0, "sctrpi1");
520 520 put_device(&port->dev);
521 521 }
522 522 }
drivers/s390/scsi/zfcp_sysfs.c
Diff comments   View file @ ea4a3a6
... ... @@ -105,8 +105,7 @@
105 105 return -EINVAL;
106 106  
107 107 zfcp_erp_set_port_status(port, ZFCP_STATUS_COMMON_RUNNING);
108   - zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED, "sypfai2",
109   - NULL);
  108 + zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED, "sypfai2");
110 109 zfcp_erp_wait(port->adapter);
111 110  
112 111 return count;
... ... @@ -148,7 +147,7 @@
148 147 if (sdev) {
149 148 zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_RUNNING);
150 149 zfcp_erp_lun_reopen(sdev, ZFCP_STATUS_COMMON_ERP_FAILED,
151   - "syufai2", NULL);
  150 + "syufai2");
152 151 zfcp_erp_wait(unit->port->adapter);
153 152 } else
154 153 zfcp_unit_scsi_scan(unit);
... ... @@ -198,7 +197,7 @@
198 197  
199 198 zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);
200 199 zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
201   - "syafai2", NULL);
  200 + "syafai2");
202 201 zfcp_erp_wait(adapter);
203 202 out:
204 203 zfcp_ccw_adapter_put(adapter);
... ... @@ -256,7 +255,7 @@
256 255  
257 256 put_device(&port->dev);
258 257  
259   - zfcp_erp_port_shutdown(port, 0, "syprs_1", NULL);
  258 + zfcp_erp_port_shutdown(port, 0, "syprs_1");
260 259 zfcp_device_unregister(&port->dev, &zfcp_sysfs_port_attrs);
261 260 out:
262 261 zfcp_ccw_adapter_put(adapter);