Fix VOP_CLOSE() in userspace.

[zfs.git] / include / sys / dsl_dataset.h

diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h
index c4530a8..7cff7e3 100644 (file)
--- a/include/sys/dsl_dataset.h
+++ b/include/sys/dsl_dataset.h
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 
 #ifndef        _SYS_DSL_DATASET_H
@@ -150,6 +151,9 @@ typedef struct dsl_dataset {
        uint64_t ds_reserved;   /* cached refreservation */
        uint64_t ds_quota;      /* cached refquota */
 
+       kmutex_t ds_sendstream_lock;
+       list_t ds_sendstreams;
+
        /* Protected by ds_lock; keep at end of struct for better locality */
        char ds_snapname[MAXNAMELEN];
 } dsl_dataset_t;
@@ -271,7 +275,7 @@ int dsl_destroy_inconsistent(const char *dsname, void *arg);
 #ifdef ZFS_DEBUG
 #define        dprintf_ds(ds, fmt, ...) do { \
        if (zfs_flags & ZFS_DEBUG_DPRINTF) { \
-       char *__ds_name = kmem_alloc(MAXNAMELEN, KM_SLEEP); \
+       char *__ds_name = kmem_alloc(MAXNAMELEN, KM_PUSHPAGE); \
        dsl_dataset_name(ds, __ds_name); \
        dprintf("ds=%s " fmt, __ds_name, __VA_ARGS__); \
        kmem_free(__ds_name, MAXNAMELEN); \