From owner-freebsd-bugs@FreeBSD.ORG Fri Jul 13 18:10:11 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 106291065675 for ; Fri, 13 Jul 2012 18:10:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3080D8FC14 for ; Fri, 13 Jul 2012 18:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6DIA3ab031203 for ; Fri, 13 Jul 2012 18:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6DIA3UC031202; Fri, 13 Jul 2012 18:10:03 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jul 2012 18:10:03 GMT Resent-Message-Id: <201207131810.q6DIA3UC031202@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steven Hartland Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5336D1065670 for ; Fri, 13 Jul 2012 18:07:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 3EC4A8FC12 for ; Fri, 13 Jul 2012 18:07:05 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6DI74Jo053073 for ; Fri, 13 Jul 2012 18:07:04 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q6DI74ED053072; Fri, 13 Jul 2012 18:07:04 GMT (envelope-from nobody) Message-Id: <201207131807.q6DI74ED053072@red.freebsd.org> Date: Fri, 13 Jul 2012 18:07:04 GMT From: Steven Hartland To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/169835: Path to remove some unused variables from scsi_da probe setup X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2012 18:10:11 -0000 >Number: 169835 >Category: misc >Synopsis: Path to remove some unused variables from scsi_da probe setup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jul 13 18:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steven Hartland >Release: 8.3-RELEASE >Organization: Multiplay >Environment: FreeBSD build 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #3: Tue Jul 3 13:16:31 UTC 2012 root@build:/usr/obj/usr/src/sys/MULTIPLAY amd64 >Description: There's a few essentially unused variables in the scsi_da setup of the probe ccb's. >How-To-Repeat: N/A/ >Fix: The attached patch removes these variables. Patch attached with submission follows: Removes essentially unused variables from scsi_da probe setups --- sys/cam/scsi/scsi_da.c.orig 2012-07-13 17:57:03.142585191 +0000 +++ sys/cam/scsi/scsi_da.c 2012-07-13 17:57:58.379971224 +0000 @@ -1821,7 +1821,6 @@ } case DA_STATE_PROBE: { - struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; rcap = (struct scsi_read_capacity_data *) @@ -1831,8 +1830,7 @@ /* da_free_periph??? */ break; } - csio = &start_ccb->csio; - scsi_read_capacity(csio, + scsi_read_capacity(&start_ccb->csio, /*retries*/4, dadone, MSG_SIMPLE_Q_TAG, @@ -1846,7 +1844,6 @@ } case DA_STATE_PROBE2: { - struct ccb_scsiio *csio; struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) @@ -1856,8 +1853,7 @@ /* da_free_periph??? */ break; } - csio = &start_ccb->csio; - scsi_read_capacity_16(csio, + scsi_read_capacity_16(&start_ccb->csio, /*retries*/ 4, /*cbfcnp*/ dadone, /*tag_action*/ MSG_SIMPLE_Q_TAG, >Release-Note: >Audit-Trail: >Unformatted: