do not forget to unlock resources (from Torek)

SCCS-vsn: sys/ufs/ffs/ufs_quota.c 7.6
SCCS-vsn: sys/ufs/ufs/ufs_quota.c 7.6

diff --git a/usr/src/sys/ufs/ffs/ufs_quota.c b/usr/src/sys/ufs/ffs/ufs_quota.c
index 813aae5..074ef60 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_quota.c
+++ b/usr/src/sys/ufs/ffs/ufs_quota.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_quota.c 7.5 (Berkeley) %G%
+ *     @(#)ufs_quota.c 7.6 (Berkeley) %G%

  */
 #include "param.h"
 #include "time.h"
  */
 #include "param.h"
 #include "time.h"


@@ -837,8 +837,11 @@ dqsync(vp, dq)
        while (dq->dq_flags & DQ_LOCK) {
                dq->dq_flags |= DQ_WANT;
                sleep((caddr_t)dq, PINOD+2);
        while (dq->dq_flags & DQ_LOCK) {
                dq->dq_flags |= DQ_WANT;
                sleep((caddr_t)dq, PINOD+2);

-               if ((dq->dq_flags & DQ_MOD) == 0)
+               if ((dq->dq_flags & DQ_MOD) == 0) {
+                       if (vp != dqvp)
+                               VOP_UNLOCK(dqvp);

                        return (0);
                        return (0);

+               }

        }
        dq->dq_flags |= DQ_LOCK;
        auio.uio_iov = &aiov;
        }
        dq->dq_flags |= DQ_LOCK;
        auio.uio_iov = &aiov;

diff --git a/usr/src/sys/ufs/ufs/ufs_quota.c b/usr/src/sys/ufs/ufs/ufs_quota.c
index 813aae5..074ef60 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_quota.c
+++ b/usr/src/sys/ufs/ufs/ufs_quota.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_quota.c 7.5 (Berkeley) %G%
+ *     @(#)ufs_quota.c 7.6 (Berkeley) %G%

  */
 #include "param.h"
 #include "time.h"
  */
 #include "param.h"
 #include "time.h"


@@ -837,8 +837,11 @@ dqsync(vp, dq)
        while (dq->dq_flags & DQ_LOCK) {
                dq->dq_flags |= DQ_WANT;
                sleep((caddr_t)dq, PINOD+2);
        while (dq->dq_flags & DQ_LOCK) {
                dq->dq_flags |= DQ_WANT;
                sleep((caddr_t)dq, PINOD+2);

-               if ((dq->dq_flags & DQ_MOD) == 0)
+               if ((dq->dq_flags & DQ_MOD) == 0) {
+                       if (vp != dqvp)
+                               VOP_UNLOCK(dqvp);

                        return (0);
                        return (0);

+               }

        }
        dq->dq_flags |= DQ_LOCK;
        auio.uio_iov = &aiov;
        }
        dq->dq_flags |= DQ_LOCK;
        auio.uio_iov = &aiov;