diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:53:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:53:30 -0700 |
| commit | f164c42161d21368d9cd4d6d6efc158baa2618db (patch) | |
| tree | fd6b2043f847b3551b1a8e13ef6fedd8ff575bad /drivers/s390/scsi/zfcp_dbf.c | |
| parent | 6973dddee264723720e18ad2be5a0a454c0f52d9 (diff) | |
| parent | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
[SCSI] SPI transport class: misc DV fixes
[SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
[SCSI] eata_pio cleanup and PCI fix
[SCSI] aacraid: README update
[SCSI] aacraid: remove scsi_remove_device
[SCSI] aacraid: merge rx and rkt code
[SCSI] aacraid: expose physical devices
[SCSI] aacraid: misc cleanup
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
[SCSI] zfcp: fix: use correct req_id in eh_abort_handler
[SCSI] zfcp: create private slab caches to guarantee proper data alignment
[SCSI] zfcp: remove zfcp_ccw_unregister function
[SCSI] aic7xxx: pause sequencer before touching SBLKCTL
[SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
[SCSI] scsi_debug version 1.80
[SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
[SCSI] aha152x: remove static host array
...
Diffstat (limited to 'drivers/s390/scsi/zfcp_dbf.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_dbf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index c033145d0f1..0aa3b1ac76a 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c @@ -707,7 +707,7 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *fsf_req, - struct zfcp_fsf_req *old_fsf_req) + unsigned long old_req_id) { struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf; struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec; @@ -768,8 +768,7 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, rec->fsf_seqno = fsf_req->seq_no; rec->fsf_issued = fsf_req->issued; } - rec->type.old_fsf_reqid = - (unsigned long) old_fsf_req; + rec->type.old_fsf_reqid = old_req_id; } else { strncpy(dump->tag, "dump", ZFCP_DBF_TAG_SIZE); dump->total_size = buflen; @@ -794,17 +793,17 @@ zfcp_scsi_dbf_event_result(const char *tag, int level, struct zfcp_fsf_req *fsf_req) { _zfcp_scsi_dbf_event_common("rslt", tag, level, - adapter, scsi_cmnd, fsf_req, NULL); + adapter, scsi_cmnd, fsf_req, 0); } inline void zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *new_fsf_req, - struct zfcp_fsf_req *old_fsf_req) + unsigned long old_req_id) { _zfcp_scsi_dbf_event_common("abrt", tag, 1, - adapter, scsi_cmnd, new_fsf_req, old_fsf_req); + adapter, scsi_cmnd, new_fsf_req, old_req_id); } inline void @@ -814,7 +813,7 @@ zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag, struct zfcp_unit *unit, struct zfcp_adapter *adapter = unit->port->adapter; _zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst", - tag, 1, adapter, scsi_cmnd, NULL, NULL); + tag, 1, adapter, scsi_cmnd, NULL, 0); } static int |