X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=37f351cb05da84cc42bc0e9255b177340e625b20;hb=a217228ce3e1c93fdfeb1d1aa6ff48b3f82abf83;hp=15f488cbdb7f24e1a88cd23f0faaf60dcbf8b45b;hpb=65d63035c60086a89d932c6f9f1691cf93728d74;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index 15f488c..37f351c 100644
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -49,6 +49,15 @@
 #include <dt_object.h>
 #include <md_object.h>
 #include <lustre_quota.h>
+
+#define _SPL_KMEM_H
+#include <sys/kstat.h>
+#define kmem_zalloc(a, b)	kzalloc(a, b)
+#define kmem_free(ptr, sz)	((void)(sz), kfree(ptr))
+#ifndef KM_SLEEP
+#define KM_SLEEP		GFP_KERNEL
+#endif
+
 #include <sys/arc.h>
 
 #include <sys/nvpair.h>
@@ -236,13 +245,16 @@ struct osd_device {
 	struct lprocfs_stats	*od_stats;
 
 	uint64_t		 od_root;
+	uint64_t		 od_O_id;
 	struct osd_oi		**od_oi_table;
 	unsigned int		 od_oi_count;
 	struct osd_seq_list	od_seq_list;
 
 	unsigned int		 od_rdonly:1,
 				 od_xattr_in_sa:1,
-				 od_quota_iused_est:1;
+				 od_quota_iused_est:1,
+				 od_is_ost:1;
+
 	char			 od_mntdev[128];
 	char			 od_svname[128];
 
@@ -424,12 +436,13 @@ uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
 int osd_options_init(void);
 int osd_convert_root_to_new_seq(const struct lu_env *env,
 				struct osd_device *o);
-
+int osd_ost_seq_exists(const struct lu_env *env, struct osd_device *osd,
+		       __u64 seq);
 /* osd_index.c */
 int osd_index_try(const struct lu_env *env, struct dt_object *dt,
 		  const struct dt_index_features *feat);
 int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
-		   const struct lu_fid *fid, struct lu_seq_range *range);
+		   obd_seq seq, struct lu_seq_range *range);
 
 /* osd_xattr.c */
 int __osd_xattr_load(udmu_objset_t *uos, uint64_t dnode, nvlist_t **sa_xattr);