From owner-freebsd-bugs@FreeBSD.ORG Mon Dec 3 04:30:00 2012 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A08B4A1B for ; Mon, 3 Dec 2012 04:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 7510F8FC12 for ; Mon, 3 Dec 2012 04:30:00 +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 qB34U0CL000849 for ; Mon, 3 Dec 2012 04:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB34U0xY000848; Mon, 3 Dec 2012 04:30:00 GMT (envelope-from gnats) Resent-Date: Mon, 3 Dec 2012 04:30:00 GMT Resent-Message-Id: <201212030430.qB34U0xY000848@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, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 938FCA13 for ; Mon, 3 Dec 2012 04:29:18 +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 7C01F8FC0C for ; Mon, 3 Dec 2012 04:29:18 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB34TIjd060514 for ; Mon, 3 Dec 2012 04:29:18 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qB34TIF1060513; Mon, 3 Dec 2012 04:29:18 GMT (envelope-from nobody) Message-Id: <201212030429.qB34TIF1060513@red.freebsd.org> Date: Mon, 3 Dec 2012 04:29:18 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: bin/174072: [patch] mptutil: capture cam related errors X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 04:30:00 -0000 >Number: 174072 >Category: bin >Synopsis: [patch] mptutil: capture cam related errors >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: Mon Dec 03 04:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: n/a >Organization: EMC Isilon >Environment: n/a >Description: The attached patch catches cam-related errors when using mptutil. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: usr.sbin/mptutil/mpt_config.c =================================================================== --- usr.sbin/mptutil/mpt_config.c (revision 243802) +++ usr.sbin/mptutil/mpt_config.c (working copy) @@ -305,10 +305,10 @@ } printf("mpt%d: Configuration cleared\n", mpt_unit); - mpt_rescan_bus(-1, -1); + error = mpt_rescan_bus(-1, -1); close(fd); - return (0); + return (error); } MPT_COMMAND(top, clear, clear_config); @@ -742,7 +742,7 @@ #ifdef DEBUG skip: #endif - mpt_rescan_bus(vol->VolumeBus, vol->VolumeID); + error = mpt_rescan_bus(vol->VolumeBus, vol->VolumeID); /* Clean up. */ free(vol); @@ -752,7 +752,7 @@ free(state.ioc2); close(fd); - return (0); + return (error); } MPT_COMMAND(top, create, create_volume); @@ -792,10 +792,10 @@ return (error); } - mpt_rescan_bus(-1, -1); + error = mpt_rescan_bus(-1, -1); close(fd); - return (0); + return (error); } MPT_COMMAND(top, delete, delete_volume); @@ -1015,7 +1015,9 @@ return (error); } - mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + if (error) + return (error); free(info); close(fd); @@ -1119,7 +1121,9 @@ return (error); } - mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + error = mpt_rescan_bus(info->PhysDiskBus, info->PhysDiskID); + if (error) + return (error); free(info); close(fd); >Release-Note: >Audit-Trail: >Unformatted: