From owner-svn-src-stable-8@FreeBSD.ORG Wed Jul 17 10:53:12 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5E8022A1; Wed, 17 Jul 2013 10:53:12 +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 50B48903; Wed, 17 Jul 2013 10:53:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HArCTZ046875; Wed, 17 Jul 2013 10:53:12 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HArCHj046874; Wed, 17 Jul 2013 10:53:12 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201307171053.r6HArCHj046874@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 17 Jul 2013 10:53:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253416 - stable/8/sys/geom/journal X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 10:53:12 -0000 Author: kib Date: Wed Jul 17 10:53:11 2013 New Revision: 253416 URL: http://svnweb.freebsd.org/changeset/base/253416 Log: MFC r253141: When panicing due to the gjournal overflow, print the geom metadata journal id. Modified: stable/8/sys/geom/journal/g_journal.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/geom/ (props changed) Modified: stable/8/sys/geom/journal/g_journal.c ============================================================================== --- stable/8/sys/geom/journal/g_journal.c Wed Jul 17 10:35:57 2013 (r253415) +++ stable/8/sys/geom/journal/g_journal.c Wed Jul 17 10:53:11 2013 (r253416) @@ -339,7 +339,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);