From owner-svn-src-all@FreeBSD.ORG  Fri May  7 08:20:56 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7083B1065673;
	Fri,  7 May 2010 08:20:56 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 604E88FC1B;
	Fri,  7 May 2010 08:20:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o478KuHJ038387;
	Fri, 7 May 2010 08:20:56 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o478Kunr038385;
	Fri, 7 May 2010 08:20:56 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201005070820.o478Kunr038385@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 7 May 2010 08:20:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207741 - head/sys/ufs/ffs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 07 May 2010 08:20:56 -0000

Author: jeff
Date: Fri May  7 08:20:56 2010
New Revision: 207741
URL: http://svn.freebsd.org/changeset/base/207741

Log:
   - Use the correct flag mask when determining whether an inode has
     successfully made it to the free list yet or not.  This fixes
     a deadlock that can occur with unlinked but referenced files.
     Journal space and inodedeps were not correctly reclaimed because
     the inode block was not left dirty.
  
  Tested/Reported by:	lwindschuh@googlemail.com

Modified:
  head/sys/ufs/ffs/ffs_softdep.c

Modified: head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- head/sys/ufs/ffs/ffs_softdep.c	Fri May  7 06:58:53 2010	(r207740)
+++ head/sys/ufs/ffs/ffs_softdep.c	Fri May  7 08:20:56 2010	(r207741)
@@ -9301,7 +9301,7 @@ handle_written_inodeblock(inodedep, bp)
 			hadchanges = 1;
 	}
 	/* Leave this inodeblock dirty until it's in the list. */
-	if ((inodedep->id_state & (UNLINKED | DEPCOMPLETE)) == UNLINKED)
+	if ((inodedep->id_state & (UNLINKED | UNLINKONLIST)) == UNLINKED)
 		hadchanges = 1;
 	/*
 	 * If we had to rollback the inode allocation because of