diff options
| author | delphij <delphij@FreeBSD.org> | 2010-08-30 19:15:04 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-08-30 19:15:04 +0000 |
| commit | d2ed74818d75c30ee5ed1a7309cda803e93f9656 (patch) | |
| tree | 77eaa0d5ab53d4b0e086f94a1b7c8f9173351032 /sys/dev/twa/tw_cl_init.c | |
| parent | 3cf9c58268317dd153bdb1a1307860ce3701edb8 (diff) | |
| download | FreeBSD-src-d2ed74818d75c30ee5ed1a7309cda803e93f9656.zip FreeBSD-src-d2ed74818d75c30ee5ed1a7309cda803e93f9656.tar.gz | |
Vendor update to version 3.80.06.003 to fix a panic with ZFS when under
heavy I/O load.
Many thanks to LSI for continuing to support FreeBSD.
PR: kern/149968
Submitted by: LSI (Tom Couch)
Reported by: Kai Kockro <kkockro web de>
Tested by: Kai Kockro, jpaetzel
MFC after: 7 days
Diffstat (limited to 'sys/dev/twa/tw_cl_init.c')
| -rw-r--r-- | sys/dev/twa/tw_cl_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/twa/tw_cl_init.c b/sys/dev/twa/tw_cl_init.c index 0b7daa5..a39da75 100644 --- a/sys/dev/twa/tw_cl_init.c +++ b/sys/dev/twa/tw_cl_init.c @@ -315,6 +315,7 @@ tw_cl_init_ctlr(struct tw_cl_ctlr_handle *ctlr_handle, TW_UINT32 flags, tw_cli_req_q_init(ctlr, TW_CLI_BUSY_Q); tw_cli_req_q_init(ctlr, TW_CLI_PENDING_Q); tw_cli_req_q_init(ctlr, TW_CLI_COMPLETE_Q); + tw_cli_req_q_init(ctlr, TW_CLI_RESET_Q); /* Initialize all locks used by CL. */ ctlr->gen_lock = &(ctlr->gen_lock_handle); @@ -675,15 +676,14 @@ tw_cli_init_connection(struct tw_cli_ctlr_context *ctlr, /* Submit the command, and wait for it to complete. */ error = tw_cli_submit_and_poll_request(req, TW_CLI_REQUEST_TIMEOUT_PERIOD); - if (error == TW_OSL_ETIMEDOUT) - /* Clean-up done by tw_cli_submit_and_poll_request. */ - return(error); if (error) goto out; if ((error = init_connect->status)) { +#if 0 tw_cli_create_ctlr_event(ctlr, TW_CL_MESSAGE_SOURCE_CONTROLLER_ERROR, &(req->cmd_pkt->cmd_hdr)); +#endif // 0 goto out; } if (set_features & TWA_EXTENDED_INIT_CONNECT) { |
