30c30
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 163101 2006-10-07 19:04:23Z flz $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 163834 2006-10-31 21:19:25Z pjd $");
1181a1182,1183
> if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0)
> softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
1253,1266c1255,1283
< scsi_read_write(&start_ccb->csio,
< /*retries*/da_retry_count,
< /*cbfcnp*/dadone,
< /*tag_action*/tag_code,
< /*read_op*/bp->bio_cmd == BIO_READ,
< /*byte2*/0,
< softc->minimum_cmd_size,
< /*lba*/bp->bio_pblkno,
< /*block_count*/bp->bio_bcount /
< softc->params.secsize,
< /*data_ptr*/ bp->bio_data,
< /*dxfer_len*/ bp->bio_bcount,
< /*sense_len*/SSD_FULL_SIZE,
< /*timeout*/da_default_timeout*1000);
---
> switch (bp->bio_cmd) {
> case BIO_READ:
> case BIO_WRITE:
> scsi_read_write(&start_ccb->csio,
> /*retries*/da_retry_count,
> /*cbfcnp*/dadone,
> /*tag_action*/tag_code,
> /*read_op*/bp->bio_cmd == BIO_READ,
> /*byte2*/0,
> softc->minimum_cmd_size,
> /*lba*/bp->bio_pblkno,
> /*block_count*/bp->bio_bcount /
> softc->params.secsize,
> /*data_ptr*/ bp->bio_data,
> /*dxfer_len*/ bp->bio_bcount,
> /*sense_len*/SSD_FULL_SIZE,
> /*timeout*/da_default_timeout*1000);
> break;
> case BIO_FLUSH:
> scsi_synchronize_cache(&start_ccb->csio,
> /*retries*/1,
> /*cbfcnp*/dadone,
> MSG_SIMPLE_Q_TAG,
> /*begin_lba*/0,/* Cover the whole disk */
> /*lb_count*/0,
> SSD_FULL_SIZE,
> /*timeout*/da_default_timeout*1000);
> break;
> }