From owner-svn-src-head@freebsd.org  Thu Mar 15 16:37:44 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 684CCF5FACA;
 Thu, 15 Mar 2018 16:37:44 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E7A26A7D7;
 Thu, 15 Mar 2018 16:37:44 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0967E18793;
 Thu, 15 Mar 2018 16:37:44 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FGbhsn077487;
 Thu, 15 Mar 2018 16:37:43 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FGbhvr077486;
 Thu, 15 Mar 2018 16:37:43 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201803151637.w2FGbhvr077486@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 15 Mar 2018 16:37:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r331008 - head/sys/dev/md
X-SVN-Group: head
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: head/sys/dev/md
X-SVN-Commit-Revision: 331008
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Mar 2018 16:37:44 -0000

Author: brooks
Date: Thu Mar 15 16:37:43 2018
New Revision: 331008
URL: https://svnweb.freebsd.org/changeset/base/331008

Log:
  Restore the behavior of returning the total number of units by
  unconditionally incrementing i in the loop;
  
  Reported by:	cem
  MFC with:	r330880
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D14685

Modified:
  head/sys/dev/md/md.c

Modified: head/sys/dev/md/md.c
==============================================================================
--- head/sys/dev/md/md.c	Thu Mar 15 16:17:02 2018	(r331007)
+++ head/sys/dev/md/md.c	Thu Mar 15 16:37:43 2018	(r331008)
@@ -1765,7 +1765,8 @@ err_after_new:
 		i = 1;
 		LIST_FOREACH(sc, &md_softc_list, list) {
 			if (i < MDNPAD - 1)
-				mdio->md_pad[i++] = sc->unit;
+				mdio->md_pad[i] = sc->unit;
+			i++;
 		}
 		mdio->md_pad[MIN(i, MDNPAD - 1)] = -1;
 		mdio->md_pad[0] = i - 1;