X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosp%2Fosp_internal.h;h=57dd8f4fa186b7af5c10b496969cc4d7aa1f6dc7;hb=63e17799a369e2ff0b140fd41dc5d7d8656d2bf0;hp=b18f5da4c31a00f879124914d55722e87539a283;hpb=1cfad9351affd7bbf4771dc4c28704ce432744ac;p=fs%2Flustre-release.git

diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h
index b18f5da..57dd8f4 100644
--- a/lustre/osp/osp_internal.h
+++ b/lustre/osp/osp_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/osp/osp_internal.h
  *
@@ -44,7 +43,6 @@
 #include <lustre_fid.h>
 #include <lustre_update.h>
 #include <lu_target.h>
-#include <lustre_mdc.h>
 
 /*
  * Infrastructure to support tracking of last committed llog record
@@ -68,7 +66,6 @@ struct osp_precreate {
 	/*
 	 * Precreation pool
 	 */
-	spinlock_t			 osp_pre_lock;
 
 	/* last fid to assign in creation */
 	struct lu_fid			 osp_pre_used_fid;
@@ -144,6 +141,10 @@ struct osp_updates {
 	 * those stale RPC(with older generation) will not be sent, otherwise it
 	 * will cause update lllog corruption */
 	__u64			ou_generation;
+
+	/* dedicate update thread */
+	struct task_struct	*ou_update_task;
+	struct lu_env		ou_env;
 };
 
 struct osp_device {
@@ -164,16 +165,14 @@ struct osp_device {
 	 * and required le64_to_cpu() conversion before use.
 	 * Protected by opd_pre_lock */
 	struct lu_fid			opd_last_used_fid;
+	/* on disk copy last_used_fid.f_oid or idif */
+	u64				opd_last_id;
 	struct lu_fid			opd_gap_start_fid;
 	int				 opd_gap_count;
-	/* connection to OST */
 	struct obd_device		*opd_obd;
 	struct obd_export		*opd_exp;
-	struct obd_uuid			 opd_cluuid;
 	struct obd_connect_data		*opd_connect_data;
-	int				 opd_connects;
-	struct proc_dir_entry		*opd_proc_entry;
-	struct lprocfs_stats		*opd_stats;
+
 	/* connection status. */
 	unsigned int			 opd_new_connection:1,
 					 opd_got_disconnected:1,
@@ -189,14 +188,13 @@ struct osp_device {
 	/* precreate structure for OSP */
 	struct osp_precreate		*opd_pre;
 	/* dedicate precreate thread */
-	struct ptlrpc_thread		 opd_pre_thread;
+	struct task_struct		*opd_pre_task;
+	spinlock_t			 opd_pre_lock;
 	/* thread waits for signals about pool going empty */
 	wait_queue_head_t		 opd_pre_waitq;
 
 	/* send update thread */
 	struct osp_updates		*opd_update;
-	/* dedicate update thread */
-	struct ptlrpc_thread		 opd_update_thread;
 
 	/*
 	 * OST synchronization thread
@@ -206,10 +204,12 @@ struct osp_device {
 	struct llog_gen			 opd_sync_generation;
 	/* number of changes to sync, used to wake up sync thread */
 	atomic_t			 opd_sync_changes;
+	/* limit of changes to sync */
+	int				 opd_sync_max_changes;
 	/* processing of changes from previous mount is done? */
 	int				 opd_sync_prev_done;
 	/* found records */
-	struct ptlrpc_thread		 opd_sync_thread;
+	struct task_struct		*opd_sync_task;
 	wait_queue_head_t		 opd_sync_waitq;
 	/* list of in flight rpcs */
 	struct list_head		 opd_sync_in_flight_list;
@@ -249,7 +249,7 @@ struct osp_device {
 	/* how often to update statfs data */
 	time64_t			 opd_statfs_maxage;
 
-	struct proc_dir_entry		*opd_symlink;
+	struct dentry			*opd_debugfs;
 
 	/* If the caller wants to do some idempotent async operations on
 	 * remote server, it can append the async remote requests on the
@@ -268,9 +268,10 @@ struct osp_device {
 	 */
 	int				opd_reserved_mb_high;
 	int				opd_reserved_mb_low;
+	bool				opd_cleanup_orphans_done;
+	bool				opd_force_creation;
 };
 
-#define opd_pre_lock			opd_pre->osp_pre_lock
 #define opd_pre_used_fid		opd_pre->osp_pre_used_fid
 #define opd_pre_last_created_fid	opd_pre->osp_pre_last_created_fid
 #define opd_pre_reserved		opd_pre->osp_pre_reserved
@@ -288,14 +289,15 @@ extern struct kmem_cache *osp_object_kmem;
  * The left part is for value, binary mode. */
 struct osp_xattr_entry {
 	struct list_head	 oxe_list;
-	atomic_t		 oxe_ref;
 	void			*oxe_value;
-	size_t			 oxe_buflen;
-	size_t			 oxe_namelen;
-	size_t			 oxe_vallen;
-	unsigned int		 oxe_exist:1,
-				 oxe_ready:1;
-	char			 oxe_buf[0];
+	atomic_t		 oxe_ref;
+	unsigned int		 oxe_buflen;
+	unsigned int		 oxe_vallen;
+	unsigned short		 oxe_namelen;
+	unsigned short		 oxe_exist:1,
+				 oxe_ready:1,
+				 oxe_largebuf:1;
+	char			 oxe_name[0];
 };
 
 /* this is a top object */
@@ -304,7 +306,8 @@ struct osp_object {
 	struct dt_object	opo_obj;
 	unsigned int		opo_reserved:1,
 				opo_non_exist:1,
-				opo_stale:1;
+				opo_stale:1,
+				opo_destroyed:1;
 
 	/* read/write lock for md osp object */
 	struct rw_semaphore	opo_sem;
@@ -314,12 +317,14 @@ struct osp_object {
 	struct list_head	opo_invalidate_cb_list;
 	/* Protect opo_ooa. */
 	spinlock_t		opo_lock;
+	/* to implement in-flight invalidation */
+	atomic_t		opo_invalidate_seq;
+	struct rw_semaphore	opo_invalidate_sem;
 };
 
-extern struct lu_object_operations osp_lu_obj_ops;
-extern const struct dt_device_operations osp_dt_ops;
-extern struct dt_object_operations osp_md_obj_ops;
-extern struct dt_body_operations osp_md_body_ops;
+extern const struct lu_object_operations osp_lu_obj_ops;
+extern const struct dt_object_operations osp_md_obj_ops;
+extern const struct dt_body_operations osp_md_body_ops;
 
 struct osp_thread_info {
 	struct lu_buf		 osi_lb;
@@ -328,7 +333,6 @@ struct osp_thread_info {
 	struct lu_attr		 osi_attr;
 	struct ost_id		 osi_oi;
 	struct ost_id		 osi_oi2;
-	u64			 osi_id;
 	loff_t			 osi_off;
 	union {
 		struct llog_rec_hdr		osi_hdr;
@@ -424,15 +428,7 @@ extern struct lu_context_key osp_thread_key;
 
 static inline struct osp_thread_info *osp_env_info(const struct lu_env *env)
 {
-	struct osp_thread_info *info;
-
-	info = lu_context_key_get(&env->le_ctx, &osp_thread_key);
-	if (info == NULL) {
-		lu_env_refill((struct lu_env *)env);
-		info = lu_context_key_get(&env->le_ctx, &osp_thread_key);
-	}
-	LASSERT(info);
-	return info;
+	return lu_env_info(env, &osp_thread_key);
 }
 
 struct osp_txn_info {
@@ -459,7 +455,7 @@ static inline int lu_device_is_osp(struct lu_device *d)
 static inline struct osp_device *lu2osp_dev(struct lu_device *d)
 {
 	LASSERT(lu_device_is_osp(d));
-	return container_of0(d, struct osp_device, opd_dt_dev.dd_lu_dev);
+	return container_of_safe(d, struct osp_device, opd_dt_dev.dd_lu_dev);
 }
 
 static inline struct lu_device *osp2lu_dev(struct osp_device *d)
@@ -470,13 +466,13 @@ static inline struct lu_device *osp2lu_dev(struct osp_device *d)
 static inline struct osp_device *dt2osp_dev(struct dt_device *d)
 {
 	LASSERT(lu_device_is_osp(&d->dd_lu_dev));
-	return container_of0(d, struct osp_device, opd_dt_dev);
+	return container_of_safe(d, struct osp_device, opd_dt_dev);
 }
 
 static inline struct osp_object *lu2osp_obj(struct lu_object *o)
 {
 	LASSERT(ergo(o != NULL, lu_device_is_osp(o->lo_dev)));
-	return container_of0(o, struct osp_object, opo_obj.do_lu);
+	return container_of_safe(o, struct osp_object, opo_obj.do_lu);
 }
 
 static inline struct lu_object *osp2lu_obj(struct osp_object *obj)
@@ -487,7 +483,7 @@ static inline struct lu_object *osp2lu_obj(struct osp_object *obj)
 static inline struct osp_object *osp_obj(const struct lu_object *o)
 {
 	LASSERT(lu_device_is_osp(o->lo_dev));
-	return container_of0(o, struct osp_object, opo_obj.do_lu);
+	return container_of_safe(o, struct osp_object, opo_obj.do_lu);
 }
 
 static inline struct osp_object *dt2osp_obj(const struct dt_object *d)
@@ -497,8 +493,8 @@ static inline struct osp_object *dt2osp_obj(const struct dt_object *d)
 
 static inline struct dt_object *osp_object_child(struct osp_object *o)
 {
-	return container_of0(lu_object_next(osp2lu_obj(o)),
-                             struct dt_object, do_lu);
+	return container_of(lu_object_next(osp2lu_obj(o)),
+			    struct dt_object, do_lu);
 }
 
 static inline struct seq_server_site *osp_seq_site(struct osp_device *osp)
@@ -506,22 +502,6 @@ static inline struct seq_server_site *osp_seq_site(struct osp_device *osp)
 	return osp->opd_dt_dev.dd_lu_dev.ld_site->ld_seq_site;
 }
 
-#define osp_init_rpc_lock(lck) mdc_init_rpc_lock(lck)
-
-static inline void osp_get_rpc_lock(struct osp_device *osp)
-{
-	struct mdc_rpc_lock *rpc_lock = osp->opd_obd->u.cli.cl_rpc_lock;
-
-	mdc_get_rpc_lock(rpc_lock, NULL);
-}
-
-static inline void osp_put_rpc_lock(struct osp_device *osp)
-{
-	struct mdc_rpc_lock *rpc_lock = osp->opd_obd->u.cli.cl_rpc_lock;
-
-	mdc_put_rpc_lock(rpc_lock, NULL);
-}
-
 static inline int osp_fid_diff(const struct lu_fid *fid1,
 			       const struct lu_fid *fid2)
 {
@@ -540,17 +520,26 @@ static inline int osp_fid_diff(const struct lu_fid *fid1,
 		       fid_idif_id(fid2->f_seq, fid2->f_oid, 0);
 	}
 
-	LASSERTF(fid_seq(fid1) == fid_seq(fid2), "fid1:"DFID
-		 ", fid2:"DFID"\n", PFID(fid1), PFID(fid2));
+	LASSERTF(fid_seq(fid1) == fid_seq(fid2), "fid1:"DFID", fid2:"DFID"\n",
+		 PFID(fid1), PFID(fid2));
 
 	return fid_oid(fid1) - fid_oid(fid2);
 }
 
+static inline void osp_fid_to_obdid(struct lu_fid *last_fid, u64 *osi_id)
+{
+	if (fid_is_idif((last_fid)))
+		*osi_id = fid_idif_id(fid_seq(last_fid), fid_oid(last_fid),
+				      fid_ver(last_fid));
+	else
+		*osi_id = fid_oid(last_fid);
+}
 
 static inline void osp_update_last_fid(struct osp_device *d, struct lu_fid *fid)
 {
 	int diff = osp_fid_diff(fid, &d->opd_last_used_fid);
 	struct lu_fid *gap_start = &d->opd_gap_start_fid;
+
 	/*
 	 * we might have lost precreated objects due to VBR and precreate
 	 * orphans, the gap in objid can be calculated properly only here
@@ -570,6 +559,7 @@ static inline void osp_update_last_fid(struct osp_device *d, struct lu_fid *fid)
 			       PFID(&d->opd_gap_start_fid), d->opd_gap_count);
 		}
 		d->opd_last_used_fid = *fid;
+		osp_fid_to_obdid(fid, &d->opd_last_id);
 	}
 }
 
@@ -625,10 +615,10 @@ osp_current_object_update_request(struct osp_update_request *our);
 int osp_object_update_request_create(struct osp_update_request *our,
 				     size_t size);
 
-#define osp_update_rpc_pack(env, name, our, op, ...)			\
+#define OSP_UPDATE_RPC_PACK(env, out_something_pack, our, ...)		\
 ({									\
-	struct object_update	*object_update;				\
-	size_t			max_update_length;			\
+	struct object_update *object_update;				\
+	size_t max_update_length;					\
 	struct osp_update_request_sub *ours;				\
 	int ret;							\
 									\
@@ -640,9 +630,9 @@ int osp_object_update_request_create(struct osp_update_request *our,
 									\
 		object_update = update_buffer_get_update(ours->ours_req,\
 					 ours->ours_req->ourq_count);	\
-		ret = out_##name##_pack(env, object_update,		\
-					&max_update_length,		\
-				       __VA_ARGS__);			\
+		ret = out_something_pack(env, object_update,		\
+					 &max_update_length,		\
+					 __VA_ARGS__);			\
 		if (ret == -E2BIG) {					\
 			int rc1;					\
 			/* Create new object update request */		\
@@ -670,16 +660,6 @@ int osp_object_update_request_create(struct osp_update_request *our,
 	ret;								\
 })
 
-static inline bool osp_send_update_thread_running(struct osp_device *osp)
-{
-	return osp->opd_update_thread.t_flags & SVC_RUNNING;
-}
-
-static inline bool osp_send_update_thread_stopped(struct osp_device *osp)
-{
-	return osp->opd_update_thread.t_flags & SVC_STOPPED;
-}
-
 typedef int (*osp_update_interpreter_t)(const struct lu_env *env,
 					struct object_update_reply *rep,
 					struct ptlrpc_request *req,
@@ -688,7 +668,6 @@ typedef int (*osp_update_interpreter_t)(const struct lu_env *env,
 
 /* osp_dev.c */
 void osp_update_last_id(struct osp_device *d, u64 objid);
-extern struct llog_operations osp_mds_ost_orig_logops;
 
 /* osp_trans.c */
 int osp_insert_async_request(const struct lu_env *env, enum update_type op,
@@ -759,6 +738,7 @@ int osp_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
 int osp_xattr_del(const struct lu_env *env, struct dt_object *dt,
 		  const char *name, struct thandle *th);
 int osp_invalidate(const struct lu_env *env, struct dt_object *dt);
+bool osp_check_stale(struct dt_object *dt);
 void osp_obj_invalidate_cache(struct osp_object *obj);
 
 int osp_trans_stop(const struct lu_env *env, struct dt_device *dt,
@@ -790,7 +770,8 @@ extern const struct dt_index_operations osp_md_index_ops;
 
 /* osp_precreate.c */
 int osp_init_precreate(struct osp_device *d);
-int osp_precreate_reserve(const struct lu_env *env, struct osp_device *d);
+int osp_precreate_reserve(const struct lu_env *env,
+			  struct osp_device *d, bool can_block);
 __u64 osp_precreate_get_id(struct osp_device *d);
 int osp_precreate_get_fid(const struct lu_env *env, struct osp_device *d,
 			  struct lu_fid *fid);
@@ -802,9 +783,13 @@ int osp_reset_last_used(const struct lu_env *env, struct osp_device *osp);
 int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp,
 				 struct lu_fid *fid, int sync);
 int osp_init_pre_fid(struct osp_device *osp);
+int osp_init_statfs(struct osp_device *osp);
+void osp_fini_statfs(struct osp_device *osp);
+void osp_statfs_fini(struct osp_device *d);
 
 /* lproc_osp.c */
-void osp_lprocfs_init(struct osp_device *osp);
+void osp_tunables_init(struct osp_device *osp);
+void osp_tunables_fini(struct osp_device *osp);
 
 /* osp_sync.c */
 int osp_sync_declare_add(const struct lu_env *env, struct osp_object *o,
@@ -820,7 +805,7 @@ int osp_sync_add_commit_cb_1s(const struct lu_env *env, struct osp_device *d,
 			      struct thandle *th);
 
 /* lwp_dev.c */
-extern struct obd_ops lwp_obd_device_ops;
+extern const struct obd_ops lwp_obd_device_ops;
 extern struct lu_device_type lwp_device_type;
 
 static inline struct lu_device *osp2top(const struct osp_device *osp)