diff options
| author | kib <kib@FreeBSD.org> | 2007-03-20 10:51:45 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2007-03-20 10:51:45 +0000 |
| commit | 7f02b9589e4d24ce8d3b7c75d4b40f233a1109da (patch) | |
| tree | 2ae0b6d6f0fb51e5973393c60f07c5d38e77ee9a | |
| parent | eecb0a8aa72ff92a9cc4881892c8fa117737ad7f (diff) | |
| download | FreeBSD-src-7f02b9589e4d24ce8d3b7c75d4b40f233a1109da.zip FreeBSD-src-7f02b9589e4d24ce8d3b7c75d4b40f233a1109da.tar.gz | |
Mark UFS as being MP-Safe in "options QUOTA" case too. Remove no more
neccessary Giant acquisions in softdepend processing code.
Tested by: Peter Holm
Reviewed by: tegge
Approved by: re (kensmith)
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 9 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 6d13610..431548e 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -722,16 +722,12 @@ softdep_flush(void) struct ufsmount *ump; struct thread *td; int remaining; - int vfslocked; td = curthread; td->td_pflags |= TDP_NORUNNINGBUF; for (;;) { kthread_suspend_check(softdepproc); -#ifdef QUOTA - mtx_lock(&Giant); -#endif ACQUIRE_LOCK(&lk); /* * If requested, try removing inode or removal dependencies. @@ -747,9 +743,6 @@ softdep_flush(void) wakeup_one(&proc_waiting); } FREE_LOCK(&lk); -#ifdef QUOTA - mtx_unlock(&Giant); -#endif remaining = 0; mtx_lock(&mountlist_mtx); for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { @@ -758,12 +751,10 @@ softdep_flush(void) continue; if (vfs_busy(mp, LK_NOWAIT, &mountlist_mtx, td)) continue; - vfslocked = VFS_LOCK_GIANT(mp); softdep_process_worklist(mp, 0); ump = VFSTOUFS(mp); remaining += ump->softdep_on_worklist - ump->softdep_on_worklist_inprogress; - VFS_UNLOCK_GIANT(vfslocked); mtx_lock(&mountlist_mtx); nmp = TAILQ_NEXT(mp, mnt_list); vfs_unbusy(mp, td); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 8aa5193..4357e86 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -880,19 +880,9 @@ ffs_mountfs(devvp, mp, td) (void) ufs_extattr_autostart(mp, td); #endif /* !UFS_EXTATTR_AUTOSTART */ #endif /* !UFS_EXTATTR */ -#ifdef QUOTA - /* - * Our bufobj must require giant for snapshots when quotas are - * enabled. - */ - BO_LOCK(&devvp->v_bufobj); - devvp->v_bufobj.bo_flag |= BO_NEEDSGIANT; - BO_UNLOCK(&devvp->v_bufobj); -#else MNT_ILOCK(mp); mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); -#endif return (0); out: if (bp) |
