From owner-svn-src-all@FreeBSD.ORG  Thu Jan 17 00:09:51 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 49759348;
 Thu, 17 Jan 2013 00:09:51 +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 3B17B960;
 Thu, 17 Jan 2013 00:09:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0H09p9C014392;
 Thu, 17 Jan 2013 00:09:51 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0H09pC6014391;
 Thu, 17 Jan 2013 00:09:51 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201301170009.r0H09pC6014391@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 17 Jan 2013 00:09:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245519 - head/sys/geom/raid
X-SVN-Group: head
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, 17 Jan 2013 00:09:51 -0000

Author: mav
Date: Thu Jan 17 00:09:50 2013
New Revision: 245519
URL: http://svnweb.freebsd.org/changeset/base/245519

Log:
  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:
  head/sys/geom/raid/tr_concat.c

Modified: head/sys/geom/raid/tr_concat.c
==============================================================================
--- head/sys/geom/raid/tr_concat.c	Wed Jan 16 23:49:55 2013	(r245518)
+++ head/sys/geom/raid/tr_concat.c	Thu Jan 17 00:09:50 2013	(r245519)
@@ -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++) {