Author: mckusick
Date: Sun Dec 29 07:29:45 2013
New Revision: 260034
URL: http://svnweb.freebsd.org/changeset/base/260034
Log:
MFC of 258789:
We needlessly panic when trying to flush MKDIR_PARENT dependencies.
We had previously tried to flush all MKDIR_PARENT dependencies (and
all the NEWBLOCK pagedeps) by calling ffs_update(). However this will
only resolve these dependencies in direct blocks. So very large
directories with MKDIR_PARENT dependencies in indirect blocks had
not yet gotten flushed. As the directory is in the midst of doing a
complete sync, we simply defer the checking of the MKDIR_PARENT
dependencies until the indirect blocks have been sync'ed.
Reported by: Shawn Wallbridge of imaginaryforces.com
Tested by: John-Mark Gurney <j...@funkthat.com>
PR: 183424
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 Sun Dec 29 07:26:48 2013
(r260033)
+++ stable/9/sys/ufs/ffs/ffs_softdep.c Sun Dec 29 07:29:45 2013
(r260034)
@@ -12618,7 +12618,9 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
int error = 0;
struct buf *bp;
ino_t inum;
+ struct diraddhd unfinished;
+ LIST_INIT(&unfinished);
ump = VFSTOUFS(mp);
restart:
while ((dap = LIST_FIRST(diraddhdp)) != NULL) {
@@ -12636,8 +12638,20 @@ restart:
*/
if (dap != LIST_FIRST(diraddhdp))
continue;
- if (dap->da_state & MKDIR_PARENT)
- panic("flush_pagedep_deps: MKDIR_PARENT");
+ /*
+ * All MKDIR_PARENT dependencies and all the
+ * NEWBLOCK pagedeps that are contained in direct
+ * blocks were resolved by doing above ffs_update.
+ * Pagedeps contained in indirect blocks may
+ * require a complete sync'ing of the directory.
+ * We are in the midst of doing a complete sync,
+ * so if they are not resolved in this pass we
+ * defer them for now as they will be sync'ed by
+ * our caller shortly.
+ */
+ LIST_REMOVE(dap, da_pdlist);
+ LIST_INSERT_HEAD(&unfinished, dap, da_pdlist);
+ continue;
}
/*
* A newly allocated directory must have its "." and
@@ -12745,6 +12759,10 @@ retry:
}
if (error)
ACQUIRE_LOCK(&lk);
+ while ((dap = LIST_FIRST(&unfinished)) != NULL) {
+ LIST_REMOVE(dap, da_pdlist);
+ LIST_INSERT_HEAD(diraddhdp, dap, da_pdlist);
+ }
return (error);
}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
