X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fudmu.h;h=9fec38f6a2da18e40810ba186682195f57a91de5;hb=98ac0fe3a45dde62759ecaa4c84e6250ac2067f8;hp=45487b6d26edc597e9758d616f82548a19624198;hpb=a6179606f842d8fb0961296011ed70d383cc0f4e;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/udmu.h b/lustre/osd-zfs/udmu.h
index 45487b6..9fec38f 100644
--- a/lustre/osd-zfs/udmu.h
+++ b/lustre/osd-zfs/udmu.h
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2011, 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -46,7 +46,6 @@
 #define _DMU_H
 
 #include <sys/zap.h>
-#include <sys/vnode.h>
 #include <sys/mode.h>
 #include <sys/sa.h>
 
@@ -55,7 +54,7 @@
 typedef struct udmu_objset {
 	struct objset	*os;
 	uint64_t	root;  /* id of root znode */
-	cfs_spinlock_t	lock;  /* protects objects below */
+	spinlock_t	lock;  /* protects objects below */
 	uint64_t	objects; /* in-core counter of objects */
 	/* SA attr mapping->id,
 	 * name is the same as in ZFS to use defines SA_ZPL_...*/
@@ -92,15 +91,6 @@ int udmu_objset_root(udmu_objset_t *uos, dmu_buf_t **dbp, void *tag);
 uint64_t udmu_get_txg(udmu_objset_t *uos, dmu_tx_t *tx);
 int udmu_blk_insert_cost(void);
 
-/* buf must have at least MAXNAMELEN bytes */
-void udmu_objset_name_get(udmu_objset_t *uos, char *buf);
-
-/* get/set ZFS user properties */
-int udmu_userprop_set_str(udmu_objset_t *uos, const char *prop_name,
-			  const char *val);
-int udmu_userprop_get_str(udmu_objset_t *uos, const char *prop_name, char *buf,
-			  size_t buf_size);
-
 /* zap cursor apis */
 int udmu_zap_cursor_init(zap_cursor_t **zc, udmu_objset_t *uos,
 		uint64_t zapobj, uint64_t hash);