xnu-517.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_quota.c

diff --git a/bsd/hfs/hfs_quota.c b/bsd/hfs/hfs_quota.c
index c486d3a1c7f4f63e08b08de8521152f591215df4..e294f9dc12dcf937b3ec39c202c78a37f63f73f9 100644 (file)
--- a/bsd/hfs/hfs_quota.c
+++ b/bsd/hfs/hfs_quota.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -707,11 +707,9 @@ again:
        for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nextvp) {
                if (vp->v_mount != mp)
                        goto again;
        for (vp = mp->mnt_vnodelist.lh_first; vp != NULL; vp = nextvp) {
                if (vp->v_mount != mp)
                        goto again;

-

                nextvp = vp->v_mntvnodes.le_next;
                simple_lock(&vp->v_interlock);
                simple_unlock(&mntvnode_slock);
                nextvp = vp->v_mntvnodes.le_next;
                simple_lock(&vp->v_interlock);
                simple_unlock(&mntvnode_slock);

-

                error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
                if (error) {
                        simple_lock(&mntvnode_slock);
                error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
                if (error) {
                        simple_lock(&mntvnode_slock);


@@ -720,13 +718,11 @@ again:
                        continue;
                }
 
                        continue;
                }
 

-               // Make sure that this is really an hfs vnode.
-               //
-               if (   vp->v_mount != mp
-                       || vp->v_type == VNON
-                       || vp->v_tag != VT_HFS
-                       || VTOC(vp) == NULL) {
-                       
+               /* Make sure that this is really an hfs vnode. */
+               if (vp->v_mount != mp   ||
+                   vp->v_type == VNON  ||
+                   vp->v_tag != VT_HFS ||
+                   VTOC(vp) == NULL) {

                        vput(vp);
                        simple_lock(&mntvnode_slock);
                        goto again;
                        vput(vp);
                        simple_lock(&mntvnode_slock);
                        goto again;