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 11278c5f5876fae716bb5af66bf1b1d759efd15f..e294f9dc12dcf937b3ec39c202c78a37f63f73f9 100644 (file)
--- a/bsd/hfs/hfs_quota.c
+++ b/bsd/hfs/hfs_quota.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -704,11 +707,9 @@ 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);
-
                error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_INTERLOCK, p);
                if (error) {
                        simple_lock(&mntvnode_slock);
@@ -717,13 +718,11 @@ again:
                        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;