Author: kib
Date: Thu Sep 22 09:04:05 2016
New Revision: 306168
URL: https://svnweb.freebsd.org/changeset/base/306168

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/11/sys/ufs/ufs/ufs_quota.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/ufs/ufs/ufs_quota.c
==============================================================================
--- stable/11/sys/ufs/ufs/ufs_quota.c   Thu Sep 22 09:02:04 2016        
(r306167)
+++ stable/11/sys/ufs/ufs/ufs_quota.c   Thu Sep 22 09:04:05 2016        
(r306168)
@@ -1538,8 +1538,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);
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to