From owner-svn-src-stable@FreeBSD.ORG  Wed Jul 17 10:35:57 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E5DF4DAD;
 Wed, 17 Jul 2013 10:35:57 +0000 (UTC) (envelope-from kib@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 D7C77843;
 Wed, 17 Jul 2013 10:35:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HAZvZ8041372;
 Wed, 17 Jul 2013 10:35:57 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HAZvSM041371;
 Wed, 17 Jul 2013 10:35:57 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201307171035.r6HAZvSM041371@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 17 Jul 2013 10:35:57 +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: r253415 - stable/9/sys/geom/journal
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jul 2013 10:35:58 -0000

Author: kib
Date: Wed Jul 17 10:35:57 2013
New Revision: 253415
URL: http://svnweb.freebsd.org/changeset/base/253415

Log:
  MFC r253141:
  When panicing due to the gjournal overflow, print the geom metadata
  journal id.
  
  Approved by:	re (rodrigc)

Modified:
  stable/9/sys/geom/journal/g_journal.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/journal/g_journal.c
==============================================================================
--- stable/9/sys/geom/journal/g_journal.c	Wed Jul 17 10:12:31 2013	(r253414)
+++ stable/9/sys/geom/journal/g_journal.c	Wed Jul 17 10:35:57 2013	(r253415)
@@ -341,7 +341,9 @@ g_journal_check_overflow(struct g_journa
 	    (sc->sc_active.jj_offset > sc->sc_inactive.jj_offset &&
 	     sc->sc_journal_offset >= sc->sc_inactive.jj_offset &&
 	     sc->sc_journal_offset < sc->sc_active.jj_offset)) {
-		panic("Journal overflow (joffset=%jd active=%jd inactive=%jd)",
+		panic("Journal overflow "
+		    "(id = %u joffset=%jd active=%jd inactive=%jd)",
+		    (unsigned)sc->sc_id,
 		    (intmax_t)sc->sc_journal_offset,
 		    (intmax_t)sc->sc_active.jj_offset,
 		    (intmax_t)sc->sc_inactive.jj_offset);