diff options
| author | kib <kib@FreeBSD.org> | 2016-09-22 10:46:08 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-09-22 10:46:08 +0000 |
| commit | 25f8d877cbae74ef86bd5917295eca959e8e61b9 (patch) | |
| tree | 28c760193d3f9ea9cd498196fcf39d246dcd2e23 | |
| parent | 45ac68e275113fea011555bd36cc14c1a820cfdf (diff) | |
| download | FreeBSD-src-25f8d877cbae74ef86bd5917295eca959e8e61b9.zip FreeBSD-src-25f8d877cbae74ef86bd5917295eca959e8e61b9.tar.gz | |
MFC r305594:
In softdep_prealloc(), return early not only for snapshots, but for
the quota files as well.
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 58ef6dc..3e552fa 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -2996,10 +2996,13 @@ softdep_prealloc(vp, waitok) ("softdep_prealloc called on non-softdep filesystem")); /* * Nothing to do if we are not running journaled soft updates. - * If we currently hold the snapshot lock, we must avoid handling - * other resources that could cause deadlock. + * If we currently hold the snapshot lock, we must avoid + * handling other resources that could cause deadlock. Do not + * touch quotas vnode since it is typically recursed with + * other vnode locks held. */ - if (DOINGSUJ(vp) == 0 || IS_SNAPSHOT(VTOI(vp))) + if (DOINGSUJ(vp) == 0 || IS_SNAPSHOT(VTOI(vp)) || + (vp->v_vflag & VV_SYSTEM) != 0) return (0); ump = VFSTOUFS(vp->v_mount); ACQUIRE_LOCK(ump); |
