diff options
| author | kib <kib@FreeBSD.org> | 2014-08-12 09:33:00 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-08-12 09:33:00 +0000 |
| commit | c721b1c6ffb1fe3336159b4491dc3639e28eaa73 (patch) | |
| tree | 67b2c60ae515a6077c88eedba10347f692c922fb /sys/ufs | |
| parent | e3be5d165dde1c298d229cda33b01b61a79763fe (diff) | |
| download | FreeBSD-src-c721b1c6ffb1fe3336159b4491dc3639e28eaa73.zip FreeBSD-src-c721b1c6ffb1fe3336159b4491dc3639e28eaa73.tar.gz | |
Revision r269457 removed the Giant around mount and unmount code, but
r269533, which was tested before r269457 was committed, implicitely
relied on the Giant to protect the manipulations of the softdepmounts
list. Use softdep global lock consistently to guarantee the list
structure now.
Insert the new struct mount_softdeps into the softdepmounts only after
it is sufficiently initialized, to prevent softdep_speedup() from
accessing bare memory. Similarly, remove struct mount_softdeps for
the unmounted filesystem from the tailq before destroying structure
rwlock.
Reported and tested by: pho
Reviewed by: mckusick
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index a847722..ecb7ffa 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -2453,7 +2453,6 @@ softdep_mount(devvp, mp, fs, cred) ump->um_softdep = sdp; MNT_IUNLOCK(mp); rw_init(LOCK_PTR(ump), "Per-Filesystem Softdep Lock"); - TAILQ_INSERT_TAIL(&softdepmounts, sdp, sd_next); sdp->sd_ump = ump; LIST_INIT(&ump->softdep_workitem_pending); LIST_INIT(&ump->softdep_journal_pending); @@ -2479,6 +2478,9 @@ softdep_mount(devvp, mp, fs, cred) ump->indir_hash_size = i - 1; for (i = 0; i <= ump->indir_hash_size; i++) TAILQ_INIT(&ump->indir_hashtbl[i]); + ACQUIRE_GBLLOCK(&lk); + TAILQ_INSERT_TAIL(&softdepmounts, sdp, sd_next); + FREE_GBLLOCK(&lk); if ((fs->fs_flags & FS_SUJ) && (error = journal_mount(mp, fs, cred)) != 0) { printf("Failed to start journal: %d\n", error); @@ -2562,8 +2564,10 @@ softdep_unmount(mp) /* * Free up our resources. */ - rw_destroy(LOCK_PTR(ump)); + ACQUIRE_GBLLOCK(&lk); TAILQ_REMOVE(&softdepmounts, ump->um_softdep, sd_next); + FREE_GBLLOCK(&lk); + rw_destroy(LOCK_PTR(ump)); hashdestroy(ump->pagedep_hashtbl, M_PAGEDEP, ump->pagedep_hash_size); hashdestroy(ump->inodedep_hashtbl, M_INODEDEP, ump->inodedep_hash_size); hashdestroy(ump->newblk_hashtbl, M_NEWBLK, ump->newblk_hash_size); |
