From owner-freebsd-bugs@FreeBSD.ORG Tue Apr 5 22:20:04 2005 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB3B316A4CE for ; Tue, 5 Apr 2005 22:20:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99EF243D45 for ; Tue, 5 Apr 2005 22:20:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j35MK3Ur071196 for ; Tue, 5 Apr 2005 22:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j35MK310071195; Tue, 5 Apr 2005 22:20:03 GMT (envelope-from gnats) Resent-Date: Tue, 5 Apr 2005 22:20:03 GMT Resent-Message-Id: <200504052220.j35MK310071195@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, "Wojciech A. Koszek" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 140CB16A4CE for ; Tue, 5 Apr 2005 22:15:24 +0000 (GMT) Received: from freebsd.czest.pl (silver.iplus.pl [80.48.250.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id D490F43D41 for ; Tue, 5 Apr 2005 22:15:22 +0000 (GMT) (envelope-from dunstan@freebsd.czest.pl) Received: from freebsd.czest.pl (freebsd.czest.pl [80.48.250.4]) by freebsd.czest.pl (8.12.10/8.12.9) with ESMTP id j35MNQtf076972 for ; Tue, 5 Apr 2005 22:23:26 GMT (envelope-from dunstan@freebsd.czest.pl) Received: (from dunstan@localhost) by freebsd.czest.pl (8.12.10/8.12.9/Submit) id j35MNPce076971; Tue, 5 Apr 2005 22:23:25 GMT (envelope-from dunstan) Message-Id: <200504052223.j35MNPce076971@freebsd.czest.pl> Date: Tue, 5 Apr 2005 22:23:25 GMT From: "Wojciech A. Koszek" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/79575: [PATCH] Fixes order of disks in 'mdconfig -l' output X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Wojciech A. Koszek" List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 22:20:04 -0000 >Number: 79575 >Category: kern >Synopsis: [PATCH] Fixes order of disks in 'mdconfig -l' output >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: Tue Apr 05 22:20:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Wojciech A. Koszek >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD dunstan.freebsd.czest.pl 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #6: Mon Apr 4 21:06:12 CEST 2005 dunstan@dunstan.freebsd.czest.pl:/usr/obj/usr/src/sys/HOME8 i386 Also -CURRENT. >Description: While listing memory disks, their order is reversed, which makes reading harder. I was informed that old implementation ordered disks correctly. >How-To-Repeat: mdconfig -a -t malloc -s 10m mdconfig -a -t malloc -s 10m mdconfig -a -t malloc -s 10m And result: mdconfig -l md2 md1 md0 >Fix: This patch [diff.0.md.c] causes that result will be: mdconfig -l md0 md1 md2 --- diff.0.md.c begins here --- (c) 2005 Patch against FreeBSD 5.4-PRERELEASE, kern.osreldate: 503105. diff -uprP /usr/src/sys/dev/md/md.c src/sys/dev/md/md.c --- /usr/src/sys/dev/md/md.c Tue Mar 1 22:49:18 2005 +++ src/sys/dev/md/md.c Tue Apr 5 22:31:28 2005 @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -685,6 +686,12 @@ mdfind(int unit) return (sc); } +static int +mdunitcmp (void *a, void *b) +{ + return (*(int *)a - *(int *)b); +} + static struct md_s * mdnew(int unit) { @@ -1160,6 +1167,8 @@ mdctlioctl(struct cdev *dev, u_long cmd, mdio->md_pad[i++] = sc->unit; } mdio->md_pad[0] = i - 1; + qsort(&mdio->md_pad[1], i - 1, sizeof(mdio->md_pad[1]), + mdunitcmp); return (0); default: return (ENOIOCTL); --- diff.0.md.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: