svn commit: r306178 - stable/10/sys/ufs/ufs
Konstantin Belousov
kib at FreeBSD.org
Thu Sep 22 10:47:57 UTC 2016
Author: kib
Date: Thu Sep 22 10:47:56 2016
New Revision: 306178
URL: https://svnweb.freebsd.org/changeset/base/306178
Log:
MFC r305595:
In dqsync(), when called from quotactl(), um_quotas entry might appear
cleared since nothing prevents completion of the parallel quotaoff.
There is nothing to sync in this case, and no reason to panic.
Modified:
stable/10/sys/ufs/ufs/ufs_quota.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ufs/ufs/ufs_quota.c
==============================================================================
--- stable/10/sys/ufs/ufs/ufs_quota.c Thu Sep 22 10:46:08 2016 (r306177)
+++ stable/10/sys/ufs/ufs/ufs_quota.c Thu Sep 22 10:47:56 2016 (r306178)
@@ -1542,8 +1542,13 @@ dqsync(struct vnode *vp, struct dquot *d
if ((ump = dq->dq_ump) == NULL)
return (0);
UFS_LOCK(ump);
- if ((dqvp = ump->um_quotas[dq->dq_type]) == NULLVP)
- panic("dqsync: file");
+ if ((dqvp = ump->um_quotas[dq->dq_type]) == NULLVP) {
+ if (vp == NULL) {
+ UFS_UNLOCK(ump);
+ return (0);
+ } else
+ panic("dqsync: file");
+ }
vref(dqvp);
UFS_UNLOCK(ump);
More information about the svn-src-all
mailing list