X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=0e202d2b716672ffbe69299f9cc21a8a8d663002;hb=b1491d26271f074dc6f99cde037403337c0b2151;hp=ddf7bb910971fb117f43609499f364ef87887644;hpb=9f82e9216a1d80bac7ded5cfc1a711c379a30f29;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index ddf7bb9..0e202d2 100644
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -47,11 +47,22 @@
 #define _OSD_INTERNAL_H
 
 #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>
 
+#include <sys/zfs_znode.h>
 #include "udmu.h"
 
 #define LUSTRE_ROOT_FID_SEQ	0
@@ -76,14 +87,24 @@ struct osd_it_quota {
 
 /**
  * Iterator's in-memory data structure for ZAPs
+ *
+ * ZFS does not store . and .. on a disk, instead they are
+ * generated up on request
+ * to follow this format we do the same
  */
 struct osd_zap_it {
 	zap_cursor_t		*ozi_zc;
 	struct osd_object	*ozi_obj;
 	struct lustre_capa	*ozi_capa;
-	unsigned		 ozi_reset:1;     /* 1 -- no need to advance */
+	unsigned		 ozi_reset:1;	/* 1 -- no need to advance */
+	/* ozi_pos - position of the cursor:
+	 * 0 - before any record
+	 * 1 - "."
+	 * 2 - ".."
+	 * 3 - real records */
+	unsigned		 ozi_pos:3;
 	union {
-		char		 ozi_name[NAME_MAX + 1]; /* file name for dir */
+		char		 ozi_name[MAXNAMELEN]; /* file name for dir */
 		__u64		 ozi_key; /* binary key for index files */
 	};
 };
@@ -146,7 +167,10 @@ struct osd_thread_info {
 	};
 
 	char			 oti_str[64];
-	char			 oti_key[MAXNAMELEN + 1];
+	union {
+		char		 oti_key[MAXNAMELEN + 1];
+		__u64		 oti_key64[(MAXNAMELEN + 1)/sizeof(__u64)];
+	};
 	struct lustre_mdt_attrs oti_mdt_attrs;
 
 	struct lu_attr		 oti_la;
@@ -224,14 +248,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;
-	uint64_t		od_ost_compat_grp0;
 	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];
 
@@ -280,7 +306,9 @@ struct osd_object {
 	uint64_t		 oo_xattr;
 
 	/* record size for index file */
-	int			 oo_recsize;
+	unsigned char		 oo_keysize;
+	unsigned char		 oo_recsize;
+	unsigned char		 oo_recusize;	/* unit size */
 };
 
 int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *);
@@ -396,11 +424,11 @@ struct lu_object *osd_object_alloc(const struct lu_env *env,
 int osd_object_sa_update(struct osd_object *obj, sa_attr_type_t type,
 			 void *buf, uint32_t buflen, struct osd_thandle *oh);
 int __osd_zap_create(const struct lu_env *env, udmu_objset_t *uos,
-		     dmu_buf_t **zap_dbp, dmu_tx_t *tx,
-		     struct lu_attr *la, void *tag, zap_flags_t flags);
+		     dmu_buf_t **zap_dbp, dmu_tx_t *tx, struct lu_attr *la,
+		     uint64_t parent, void *tag, zap_flags_t flags);
 int __osd_object_create(const struct lu_env *env, udmu_objset_t *uos,
-			dmu_buf_t **dbp, dmu_tx_t *tx,
-			struct lu_attr *la, void *tag);
+			dmu_buf_t **dbp, dmu_tx_t *tx, struct lu_attr *la,
+			uint64_t parent, void *tag);
 int __osd_object_free(udmu_objset_t *uos, uint64_t oid, dmu_tx_t *tx);
 
 /* osd_oi.c */
@@ -411,13 +439,21 @@ int osd_fid_lookup(const struct lu_env *env,
 uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
 			    const struct lu_fid *fid, char *buf);
 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,
+		   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);
+int __osd_xattr_get_large(const struct lu_env *env, udmu_objset_t *uos,
+			  uint64_t xattr, struct lu_buf *buf,
+			  const char *name, int *sizep);
 int osd_xattr_get(const struct lu_env *env, struct dt_object *dt,
 		  struct lu_buf *buf, const char *name,
 		  struct lustre_capa *capa);
@@ -460,5 +496,31 @@ osd_xattr_set_internal(const struct lu_env *env, struct osd_object *obj,
 	return rc;
 }
 
+static inline uint64_t attrs_fs2zfs(const uint32_t flags)
+{
+	return (((flags & FS_APPEND_FL)		? ZFS_APPENDONLY	: 0) |
+		((flags & FS_NODUMP_FL)		? ZFS_NODUMP		: 0) |
+		((flags & FS_IMMUTABLE_FL)	? ZFS_IMMUTABLE		: 0));
+}
+
+static inline uint32_t attrs_zfs2fs(const uint64_t flags)
+{
+	return (((flags & ZFS_APPENDONLY)	? FS_APPEND_FL		: 0) |
+		((flags & ZFS_NODUMP)		? FS_NODUMP_FL		: 0) |
+		((flags & ZFS_IMMUTABLE)	? FS_IMMUTABLE_FL	: 0));
+}
+
+#endif
+
+#ifndef HAVE_DSL_POOL_CONFIG
+static inline void dsl_pool_config_enter(dsl_pool_t *dp, char *name)
+{
+}
+
+static inline void dsl_pool_config_exit(dsl_pool_t *dp, char *name)
+{
+}
+
 #endif
+
 #endif /* _OSD_INTERNAL_H */