From owner-svn-src-all@FreeBSD.ORG  Thu Jan 31 21:24:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7F7A65C6;
 Thu, 31 Jan 2013 21:24:39 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6D13B26D;
 Thu, 31 Jan 2013 21:24:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VLOcAm032013;
 Thu, 31 Jan 2013 21:24:38 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VLOcNK032012;
 Thu, 31 Jan 2013 21:24:38 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201301312124.r0VLOcNK032012@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 31 Jan 2013 21:24:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r246160 - stable/9/sys/geom/raid
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2013 21:24:39 -0000

Author: mav
Date: Thu Jan 31 21:24:38 2013
New Revision: 246160
URL: http://svnweb.freebsd.org/changeset/base/246160

Log:
  MFC r245519:
  Recalculate volume size only for real CONCATs.  For SINGLE trust volume
  size given by metadata, as it should be correct and in some cases can be
  smaller then subdisk size.

Modified:
  stable/9/sys/geom/raid/tr_concat.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/raid/tr_concat.c
==============================================================================
--- stable/9/sys/geom/raid/tr_concat.c	Thu Jan 31 21:01:42 2013	(r246159)
+++ stable/9/sys/geom/raid/tr_concat.c	Thu Jan 31 21:24:38 2013	(r246160)
@@ -124,7 +124,8 @@ g_raid_tr_update_state_concat(struct g_r
 		 * Some metadata modules may not know CONCAT volume
 		 * mediasize until all disks connected. Recalculate.
 		 */
-		if (G_RAID_VOLUME_S_ALIVE(s) &&
+		if (vol->v_raid_level == G_RAID_VOLUME_RL_CONCAT &&
+		    G_RAID_VOLUME_S_ALIVE(s) &&
 		    !G_RAID_VOLUME_S_ALIVE(vol->v_state)) {
 			size = 0;
 			for (i = 0; i < vol->v_disks_count; i++) {