svn commit: r207741 - head/sys/ufs/ffs
Jeff Roberson
jeff at FreeBSD.org
Fri May 7 08:20:56 UTC 2010
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 at 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
More information about the svn-src-head
mailing list