Print this page
4779 vhci shouldn't abuse ddi_get_time(9f)
Reviewed by: Robert Mustacchi <rm@joyent.com>

*** 20,29 **** --- 20,32 ---- */ /* * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. */ + /* + * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + */ #ifndef _SYS_SCSI_ADAPTERS_SCSI_VHCI_H #define _SYS_SCSI_ADAPTERS_SCSI_VHCI_H /*
*** 63,73 **** */ #define TRAN2HBAPRIVATE(tran) ((struct scsi_vhci *)(tran)->tran_hba_private) #define VHCI_INIT_WAIT_TIMEOUT 60000000 #define VHCI_FOWATCH_INTERVAL 1000000 /* in usecs */ ! #define VHCI_EXTFO_TIMEOUT 3*60 /* 3 minutes */ #define SCBP_C(pkt) ((*(pkt)->pkt_scbp) & STATUS_MASK) int vhci_do_scsi_cmd(struct scsi_pkt *); /*PRINTFLIKE3*/ --- 66,76 ---- */ #define TRAN2HBAPRIVATE(tran) ((struct scsi_vhci *)(tran)->tran_hba_private) #define VHCI_INIT_WAIT_TIMEOUT 60000000 #define VHCI_FOWATCH_INTERVAL 1000000 /* in usecs */ ! #define VHCI_EXTFO_TIMEOUT (3 * 60 * NANOSEC) /* 3 minutes in nsec */ #define SCBP_C(pkt) ((*(pkt)->pkt_scbp) & STATUS_MASK) int vhci_do_scsi_cmd(struct scsi_pkt *); /*PRINTFLIKE3*/
*** 314,324 **** * to prevent unnecessary failover when a device is * is discovered across a passive path and active path * is still comng up */ int svl_waiting_for_activepath; ! time_t svl_wfa_time; /* * to keep the failover status in order to return the * failure status to target driver when targer driver * retries the command which originally triggered the --- 317,327 ---- * to prevent unnecessary failover when a device is * is discovered across a passive path and active path * is still comng up */ int svl_waiting_for_activepath; ! hrtime_t svl_wfa_time; /* * to keep the failover status in order to return the * failure status to target driver when targer driver * retries the command which originally triggered the
*** 460,470 **** * argument to scsi_watch callback. Used for processing * externally initiated failovers */ typedef struct scsi_vhci_swarg { scsi_vhci_priv_t *svs_svp; ! time_t svs_tos; /* time of submission */ mdi_pathinfo_t *svs_pi; /* pathinfo being "watched" */ int svs_release_lun; int svs_done; } scsi_vhci_swarg_t; --- 463,473 ---- * argument to scsi_watch callback. Used for processing * externally initiated failovers */ typedef struct scsi_vhci_swarg { scsi_vhci_priv_t *svs_svp; ! hrtime_t svs_tos; /* time of submission */ mdi_pathinfo_t *svs_pi; /* pathinfo being "watched" */ int svs_release_lun; int svs_done; } scsi_vhci_swarg_t;