From owner-svn-src-stable-8@FreeBSD.ORG Fri Jun 18 04:43:23 2010 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 15384106566B; Fri, 18 Jun 2010 04:43:23 +0000 (UTC) (envelope-from mjacob@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0457D8FC0C; Fri, 18 Jun 2010 04:43:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5I4hMgI051431; Fri, 18 Jun 2010 04:43:22 GMT (envelope-from mjacob@svn.freebsd.org) Received: (from mjacob@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5I4hM9P051429; Fri, 18 Jun 2010 04:43:22 GMT (envelope-from mjacob@svn.freebsd.org) Message-Id: <201006180443.o5I4hM9P051429@svn.freebsd.org> From: Matt Jacob Date: Fri, 18 Jun 2010 04:43:22 +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: r209280 - 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, 18 Jun 2010 04:43:23 -0000 Author: mjacob Date: Fri Jun 18 04:43:22 2010 New Revision: 209280 URL: http://svn.freebsd.org/changeset/base/209280 Log: This is an MFC of 207933 Deal sensibly with more than 26 sg devices. It isn't a complete solution. Modified: stable/8/sys/cam/scsi/scsi_sg.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) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/cam/scsi/scsi_sg.c ============================================================================== --- stable/8/sys/cam/scsi/scsi_sg.c Fri Jun 18 04:01:59 2010 (r209279) +++ stable/8/sys/cam/scsi/scsi_sg.c Fri Jun 18 04:43:22 2010 (r209280) @@ -303,7 +303,12 @@ sgregister(struct cam_periph *periph, vo softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); - (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); + if (periph->unit_number < 26) { + (void)make_dev_alias(softc->dev, "sg%c", periph->unit_number + 'a'); + } else { + (void)make_dev_alias(softc->dev, "sg%c%c", + ((periph->unit_number / 26) - 1) + 'a', periph->unit_number + 'a'); + } cam_periph_lock(periph); softc->dev->si_drv1 = periph;