diff options
author | nate <nate@FreeBSD.org> | 1998-10-03 19:17:11 +0000 |
---|---|---|
committer | nate <nate@FreeBSD.org> | 1998-10-03 19:17:11 +0000 |
commit | 75914bbe383daf52ea7fc212276685cc3ca3ab9a (patch) | |
tree | a0b51a3c2a85280fcd25c3e4e8e4ffc3b3d19773 /sys/ufs | |
parent | 89a9a866fee33fc0298b68918586d7dba3f2b203 (diff) | |
download | FreeBSD-src-75914bbe383daf52ea7fc212276685cc3ca3ab9a.zip FreeBSD-src-75914bbe383daf52ea7fc212276685cc3ca3ab9a.tar.gz |
Fix 'noatime' bug that was unrelated to use of noatime.
The problem is caused when a directory block is compacted. When this
occurs, softdep_change_directoryentry_offset() is called to relocate each
directory entry and adjust its matching diradd structure, if any, to match
the new location of the entry. The bug is that while
softdep_change_directoryentry_offset() correctly adjusts the offsets of
the diradd structures on the pd_diraddhd[] lists (which are not yet ready
to be committed to disk), it fails to adjust the offsets of the diradd
structures on the pd_pendinghd list (which are ready to be committed to
disk). This causes the dependency structures to be inconsistent with
the buf contents. Now, if the compaction has moved a directory entry to
the same offset as one of the diradd structures on the pd_pendinghd list
*and* a syscall is done that tries to remove this directory entry before
this directory block has been written to disk (which would empty
pd_pendinghd), a sanity check in newdirrem() will call panic() when it
notices that the inode number in the entry that it is to be removed doesn't
match the inode number in the diradd structure with that offset of that
entry.
Reviewed by: Kirk McKusick <mckusick@McKusick.COM>
Submitted by: Don Lewis <Don.Lewis@tsc.tdk.com>
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 83a4fa8..c4a2cd8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -54,7 +54,7 @@ * SUCH DAMAGE. * * from: @(#)ffs_softdep.c 9.28 (McKusick) 8/8/98 - * $Id: ffs_softdep.c,v 1.13 1998/08/12 20:46:47 julian Exp $ + * $Id: ffs_softdep.c,v 1.14 1998/09/24 15:02:46 luoqi Exp $ */ /* @@ -2230,6 +2230,15 @@ softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize) dap, da_pdlist); break; } + if (dap == NULL) { + for (dap = LIST_FIRST(&pagedep->pd_pendinghd); + dap; dap = LIST_NEXT(dap, da_pdlist)) { + if (dap->da_offset == oldoffset) { + dap->da_offset = newoffset; + break; + } + } + } done: bcopy(oldloc, newloc, entrysize); FREE_LOCK(&lk); |