d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We needlessly panic when trying to flush MKDIR_PARENT dependencies.

Browse Source 
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 <jmg@funkthat.com>
PR:          183424
MFC after:   2 weeks
This commit is contained in:
mckusick 2013-12-01 07:34:21 +00:00
parent 86274dd213
commit ec81cfc872
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/ufs/ffs/ffs_softdep.c
View File

@ -12709,7 +12709,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);
LOCK_OWNED(ump);
restart:
@ -12728,8 +12730,20 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
*/
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
@ -12838,6 +12852,10 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
}
if (error)
ACQUIRE_LOCK(ump);
while ((dap = LIST_FIRST(&unfinished)) != NULL) {
LIST_REMOVE(dap, da_pdlist);
LIST_INSERT_HEAD(diraddhdp, dap, da_pdlist);
}
return (error);
}