Ticket #1466: timeout.patch

File timeout.patch, 998 bytes (added by Martin Ziemer, 3 years ago)

  • smartmontools/ChangeLog 

    diff --git smartmontools/ChangeLog smartmontools/ChangeLog
index f2ab4749..e6103527 100644
     
    11$Id$
    22
     32021-03-22  Martin Ziemer <horrad@horrad.de>
     4
     5        os_openbsd.cpp:
     6                Apply conversion to seconds for timeouts in scsi_pass_through
     7
    382021-03-08  Christian Franke  <franke@computer.org>
    49
    510        drivedb.h:

  • smartmontools/os_openbsd.cpp 

    diff --git smartmontools/os_openbsd.cpp smartmontools/os_openbsd.cpp
index 1a20f049..04597b1f 100644
    bool openbsd_scsi_device::scsi_pass_through(scsi_cmnd_io * iop)  
    266266  sc.databuf = (char *)iop->dxferp;
    267267  sc.datalen = iop->dxfer_len;
    268268  sc.senselen = iop->max_sense_len;
    269   sc.timeout = iop->timeout == 0 ? 60000 : iop->timeout;        /* XXX */
     269  sc.timeout = (iop->timeout == 0 ? 60 : iop->timeout) * 1000;
    270270  sc.flags =
    271271    (iop->dxfer_dir == DXFER_NONE ? SCCMD_READ :
    272272    (iop->dxfer_dir == DXFER_FROM_DEVICE ? SCCMD_READ : SCCMD_WRITE));