From owner-svn-src-stable-8@FreeBSD.ORG Fri Jun 10 09:58:49 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A4991065672; Fri, 10 Jun 2011 09:58:49 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A48D8FC1D; Fri, 10 Jun 2011 09:58:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5A9wmso020663; Fri, 10 Jun 2011 09:58:48 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5A9wm0l020661; Fri, 10 Jun 2011 09:58:48 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201106100958.p5A9wm0l020661@svn.freebsd.org> From: Alexander Motin Date: Fri, 10 Jun 2011 09:58:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222925 - stable/8/sys/cam/scsi X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2011 09:58:49 -0000 Author: mav Date: Fri Jun 10 09:58:48 2011 New Revision: 222925 URL: http://svn.freebsd.org/changeset/base/222925 Log: MFC r220690 (by jh): Move a comment to the right place. The rearrange done in r208928 left the comment to a wrong place. Modified: stable/8/sys/cam/scsi/scsi_da.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/cam/scsi/scsi_da.c ============================================================================== --- stable/8/sys/cam/scsi/scsi_da.c Fri Jun 10 09:57:48 2011 (r222924) +++ stable/8/sys/cam/scsi/scsi_da.c Fri Jun 10 09:58:48 2011 (r222925) @@ -1205,10 +1205,6 @@ daregister(struct cam_periph *periph, vo TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph); /* - * Register this media as a disk - */ - - /* * Add async callbacks for bus reset and * bus device reset calls. I don't bother * checking if this fails as, in most cases, @@ -1265,6 +1261,9 @@ daregister(struct cam_periph *periph, vo else if (softc->minimum_cmd_size > 12) softc->minimum_cmd_size = 16; + /* + * Register this media as a disk. + */ softc->disk = disk_alloc(); softc->disk->d_devstat = devstat_new_entry(periph->periph_name, periph->unit_number, 0,