From f2b2032521dddcf49fc6b22500c05f18f8f95746 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 7 Aug 2012 09:16:38 +0200 Subject: [PATCH] mpt(4): Fix a porting mistake I did in 6d259fc1. I left in both the code of the "#if __FreeBSD_version" as well as that of its "#else". This caused the geometry to be calculated twice. --- sys/dev/disk/mpt/mpt_cam.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/sys/dev/disk/mpt/mpt_cam.c b/sys/dev/disk/mpt/mpt_cam.c index 462195d..dc9df52 100644 --- a/sys/dev/disk/mpt/mpt_cam.c +++ b/sys/dev/disk/mpt/mpt_cam.c @@ -4021,24 +4021,6 @@ static void mpt_calc_geometry(struct ccb_calc_geometry *ccg, int extended) { cam_calc_geometry(ccg, extended); - uint32_t size_mb; - uint32_t secs_per_cylinder; - - if (ccg->block_size == 0) { - ccg->ccb_h.status = CAM_REQ_INVALID; - return; - } - size_mb = ccg->volume_size / ((1024L * 1024L) / ccg->block_size); - if (size_mb > 1024 && extended) { - ccg->heads = 255; - ccg->secs_per_track = 63; - } else { - ccg->heads = 64; - ccg->secs_per_track = 32; - } - secs_per_cylinder = ccg->heads * ccg->secs_per_track; - ccg->cylinders = ccg->volume_size / secs_per_cylinder; - ccg->ccb_h.status = CAM_REQ_CMP; } /****************************** Timeout Recovery ******************************/ -- 1.7.7.2