diff options
| author | kib <kib@FreeBSD.org> | 2016-09-22 09:02:04 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-09-22 09:02:04 +0000 |
| commit | 83bcb87797d7cb539a41be90fa6266d0460ef77f (patch) | |
| tree | 1f01f1129acc8fe172106215e839859718083f65 /sys/ufs/ffs | |
| parent | 50712f510ff041f56e7221aec9eff9a3f9fc3d28 (diff) | |
| download | FreeBSD-src-83bcb87797d7cb539a41be90fa6266d0460ef77f.zip FreeBSD-src-83bcb87797d7cb539a41be90fa6266d0460ef77f.tar.gz | |
MFC r305594:
In softdep_prealloc(), return early not only for snapshots, but for
the quota files as well.
Diffstat (limited to 'sys/ufs/ffs')
| -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 64e9f15..c5c20f7 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -2997,10 +2997,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); |
