Update core ZFS code from build 121 to build 141.

[zfs.git] / module / zfs / include / sys / zfs_dir.h

diff --git a/module/zfs/include/sys/zfs_dir.h b/module/zfs/include/sys/zfs_dir.h
index 650315b..349f8ef 100644 (file)
--- a/module/zfs/include/sys/zfs_dir.h
+++ b/module/zfs/include/sys/zfs_dir.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,11 +42,11 @@ extern "C" {
 #define        ZRENAMING       0x0010          /* znode is being renamed */
 #define        ZCILOOK         0x0020          /* case-insensitive lookup requested */
 #define        ZCIEXACT        0x0040          /* c-i requires c-s match (rename) */
+#define        ZHAVELOCK       0x0080          /* z_name_lock is already held */
 
 /* mknode flags */
 #define        IS_ROOT_NODE    0x01            /* create a root node */
 #define        IS_XATTR        0x02            /* create an extended attribute node */
-#define        IS_REPLAY       0x04            /* we are replaying intent log */
 
 extern int zfs_dirent_lock(zfs_dirlock_t **, znode_t *, char *, znode_t **,
     int, int *, pathname_t *);
@@ -57,7 +57,7 @@ extern int zfs_link_destroy(zfs_dirlock_t *, znode_t *, dmu_tx_t *, int,
 extern int zfs_dirlook(znode_t *, char *, vnode_t **, int, int *,
     pathname_t *);
 extern void zfs_mknode(znode_t *, vattr_t *, dmu_tx_t *, cred_t *,
-    uint_t, znode_t **, int, zfs_acl_ids_t *);
+    uint_t, znode_t **, zfs_acl_ids_t *);
 extern void zfs_rmnode(znode_t *);
 extern void zfs_dl_name_switch(zfs_dirlock_t *dl, char *new, char **old);
 extern boolean_t zfs_dirempty(znode_t *);