From owner-svn-src-head@FreeBSD.ORG Fri Nov 21 08:24:38 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34BA1DC0; Fri, 21 Nov 2014 08:24:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21A6EB8B; Fri, 21 Nov 2014 08:24:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAL8OcOH055294; Fri, 21 Nov 2014 08:24:38 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAL8ObYU055293; Fri, 21 Nov 2014 08:24:37 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201411210824.sAL8ObYU055293@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 21 Nov 2014 08:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274786 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 08:24:38 -0000 Author: mav Date: Fri Nov 21 08:24:37 2014 New Revision: 274786 URL: https://svnweb.freebsd.org/changeset/base/274786 Log: Log errors for absent LUNs too. MFC after: 1 week Modified: head/sys/cam/ctl/ctl.c Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Fri Nov 21 06:27:37 2014 (r274785) +++ head/sys/cam/ctl/ctl.c Fri Nov 21 08:24:37 2014 (r274786) @@ -13710,7 +13710,7 @@ static int ctl_process_done(union ctl_io *io) { struct ctl_lun *lun; - struct ctl_softc *ctl_softc; + struct ctl_softc *ctl_softc = control_softc; void (*fe_done)(union ctl_io *io); uint32_t targ_port = ctl_port_idx(io->io_hdr.nexus.targ_port); @@ -13776,10 +13776,8 @@ ctl_process_done(union ctl_io *io) if (lun == NULL) { CTL_DEBUG_PRINT(("NULL LUN for lun %d\n", io->io_hdr.nexus.targ_mapped_lun)); - fe_done(io); goto bailout; } - ctl_softc = lun->ctl_softc; mtx_lock(&lun->lun_lock); @@ -13851,6 +13849,8 @@ ctl_process_done(union ctl_io *io) } else mtx_unlock(&lun->lun_lock); +bailout: + /* * If this command has been aborted, make sure we set the status * properly. The FETD is responsible for freeing the I/O and doing @@ -13933,8 +13933,6 @@ ctl_process_done(union ctl_io *io) } else fe_done(io); -bailout: - return (CTL_RETVAL_COMPLETE); }