xnu-792.10.96.tar.gz

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

diff --git a/bsd/hfs/hfs_xattr.c b/bsd/hfs/hfs_xattr.c
index c795bf72aa0b04f7f2bf7ec556bb65d0f5422045..1e2a11550599ebce3ff20435ee5116e2627f5eb4 100644 (file)
--- a/bsd/hfs/hfs_xattr.c
+++ b/bsd/hfs/hfs_xattr.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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 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.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -146,7 +145,12 @@ hfs_vnop_getxattr(struct vnop_getxattr_args *ap)
                        if ( !RESOURCE_FORK_EXISTS(vp)) {
                                return (ENOATTR);
                        }
-                       if ((result = hfs_vgetrsrc(hfsmp, vp, &rvp, vfs_context_proc(ap->a_context)))) {
+                       if ((result = hfs_lock(VTOC(vp), HFS_EXCLUSIVE_LOCK))) {
+                               return (result);
+                       }
+                       result = hfs_vgetrsrc(hfsmp, vp, &rvp, vfs_context_proc(ap->a_context));
+                       hfs_unlock(VTOC(vp));
+                       if (result) {
                                return (result);
                        }
                        if (uio == NULL) {
@@ -293,7 +297,12 @@ hfs_vnop_setxattr(struct vnop_setxattr_args *ap)
                                return (ENOATTR);
                        }
                }
-               if ((result = hfs_vgetrsrc(hfsmp, vp, &rvp, vfs_context_proc(ap->a_context)))) {
+               if ((result = hfs_lock(VTOC(vp), HFS_EXCLUSIVE_LOCK))) {
+                       return (result);
+               }
+               result = hfs_vgetrsrc(hfsmp, vp, &rvp, vfs_context_proc(ap->a_context));
+               hfs_unlock(VTOC(vp));
+               if (result) {
                        return (result);
                }
                result = VNOP_WRITE(rvp, uio, 0, ap->a_context);
@@ -469,7 +478,12 @@ hfs_vnop_removexattr(struct vnop_removexattr_args *ap)
                if ( !RESOURCE_FORK_EXISTS(vp) ) {
                        return (ENOATTR);
                }
-               if ((result = hfs_vgetrsrc(hfsmp, vp, &rvp, p))) {
+               if ((result = hfs_lock(VTOC(vp), HFS_EXCLUSIVE_LOCK))) {
+                       return (result);
+               }
+               result = hfs_vgetrsrc(hfsmp, vp, &rvp, p);
+               hfs_unlock(VTOC(vp));
+               if (result) {
                        return (result);
                }
                hfs_lock_truncate(VTOC(rvp), TRUE);