From owner-svn-src-all@FreeBSD.ORG  Tue Jan 22 07:10:27 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 51D05B4E;
 Tue, 22 Jan 2013 07:10:27 +0000 (UTC)
 (envelope-from scottl@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 2B6D98EF;
 Tue, 22 Jan 2013 07:10:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M7ARR3052799;
 Tue, 22 Jan 2013 07:10:27 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M7ARVU052788;
 Tue, 22 Jan 2013 07:10:27 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <201301220710.r0M7ARVU052788@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Tue, 22 Jan 2013 07:10:27 +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: r245774 - stable/9/sys/ufs/ffs
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: Tue, 22 Jan 2013 07:10:27 -0000

Author: scottl
Date: Tue Jan 22 07:10:26 2013
New Revision: 245774
URL: http://svnweb.freebsd.org/changeset/base/245774

Log:
  MFC r242492:
  
   - In cancel_mkdir_dotdot don't panic if the inodedep is not available.  If
     the previous diradd had already finished it could have been reclaimed
     already.  This would only happen under heavy dependency pressure.

Modified:
  stable/9/sys/ufs/ffs/ffs_softdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_softdep.c	Tue Jan 22 06:32:46 2013	(r245773)
+++ stable/9/sys/ufs/ffs/ffs_softdep.c	Tue Jan 22 07:10:26 2013	(r245774)
@@ -8584,7 +8584,7 @@ cancel_mkdir_dotdot(ip, dirrem, jremref)
 
 	if (inodedep_lookup(UFSTOVFS(ip->i_ump), ip->i_number, 0,
 	    &inodedep) == 0)
-		panic("cancel_mkdir_dotdot: Lost inodedep");
+		return (jremref);
 	dap = inodedep->id_mkdiradd;
 	if (dap == NULL || (dap->da_state & MKDIR_PARENT) == 0)
 		return (jremref);