X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flu_target.h;h=2079594df075132fddf170e135b24edb2180b757;hp=65dfc3c3f233360ecdf02e99eac30b9201366bcc;hb=0754bc8f2623bea184111af216f7567608db35b6;hpb=af13cfff297d4882de35fb7c11bf5261293b8287

diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h
index 65dfc3c..2079594 100644
--- a/lustre/include/lu_target.h
+++ b/lustre/include/lu_target.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -56,10 +56,14 @@ struct distribute_txn_replay_req {
 	struct list_head	dtrq_list;
 	__u64			dtrq_master_transno;
 	__u64			dtrq_batchid;
+	__u64			dtrq_xid;
 
 	/* all of sub updates are linked here */
 	struct list_head	dtrq_sub_list;
 	spinlock_t		dtrq_sub_list_lock;
+
+	/* If the local update has been executed during replay */
+	__u32			dtrq_local_update_executed:1;
 };
 
 /* Each one represents a sub replay item under a distribute
@@ -101,11 +105,10 @@ struct target_distribute_txn_data {
 	/* recovery update */
 	distribute_txn_replay_handler_t	tdtd_replay_handler;
 	struct list_head		tdtd_replay_list;
+	struct list_head		tdtd_replay_finish_list;
 	spinlock_t			tdtd_replay_list_lock;
 	/* last replay update transno */
-	__u64				tdtd_last_update_transno;
 	__u32				tdtd_replay_ready:1;
-
 };
 
 struct lu_target {
@@ -216,6 +219,11 @@ struct tgt_session_info {
 	bool			 tsi_preprocessed;
 	/* request JobID */
 	char                    *tsi_jobid;
+
+	/* update replay */
+	__u64			tsi_xid;
+	__u32			tsi_result;
+	__u32			tsi_client_gen;
 };
 
 static inline struct tgt_session_info *tgt_ses_info(const struct lu_env *env)
@@ -364,6 +372,7 @@ int tgt_sec_ctx_init(struct tgt_session_info *tsi);
 int tgt_sec_ctx_init_cont(struct tgt_session_info *tsi);
 int tgt_sec_ctx_fini(struct tgt_session_info *tsi);
 int tgt_sendpage(struct tgt_session_info *tsi, struct lu_rdpg *rdpg, int nob);
+int tgt_send_buffer(struct tgt_session_info *tsi, struct lu_rdbuf *rdbuf);
 int tgt_validate_obdo(struct tgt_session_info *tsi, struct obdo *oa);
 int tgt_sync(const struct lu_env *env, struct lu_target *tgt,
 	     struct dt_object *obj, __u64 start, __u64 end);
@@ -374,12 +383,12 @@ void tgt_io_thread_done(struct ptlrpc_thread *thread);
 int tgt_extent_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
 		    __u64 start, __u64 end, struct lustre_handle *lh,
 		    int mode, __u64 *flags);
-void tgt_extent_unlock(struct lustre_handle *lh, ldlm_mode_t mode);
+void tgt_extent_unlock(struct lustre_handle *lh, enum ldlm_mode mode);
 int tgt_brw_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
 		 struct obd_ioobj *obj, struct niobuf_remote *nb,
-		 struct lustre_handle *lh, int mode);
+		 struct lustre_handle *lh, enum ldlm_mode mode);
 void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob,
-		    struct lustre_handle *lh, int mode);
+		    struct lustre_handle *lh, enum ldlm_mode mode);
 int tgt_brw_read(struct tgt_session_info *tsi);
 int tgt_brw_write(struct tgt_session_info *tsi);
 int tgt_hpreq_handler(struct ptlrpc_request *req);
@@ -392,6 +401,7 @@ void tgt_register_lfsck_query(int (*query)(const struct lu_env *,
 					   struct lfsck_request *));
 bool req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd);
 
+extern struct tgt_handler tgt_sec_ctx_handlers[];
 extern struct tgt_handler tgt_lfsck_handlers[];
 extern struct tgt_handler tgt_obd_handlers[];
 extern struct tgt_handler tgt_dlm_handlers[];
@@ -437,6 +447,11 @@ int tgt_truncate_last_rcvd(const struct lu_env *env, struct lu_target *tg,
 			   loff_t off);
 int tgt_reply_data_init(const struct lu_env *env, struct lu_target *tgt);
 bool tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd);
+int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
+		       struct tg_export_data *ted, struct tg_reply_data *trd,
+		       struct thandle *th, bool update_lrd_file);
+struct tg_reply_data *tgt_lookup_reply_by_xid(struct tg_export_data *ted,
+					       __u64 xid);
 
 /* target/update_trans.c */
 int distribute_txn_init(const struct lu_env *env,
@@ -462,7 +477,10 @@ distribute_txn_get_next_req(struct target_distribute_txn_data *tdtd);
 void dtrq_destroy(struct distribute_txn_replay_req *dtrq);
 struct distribute_txn_replay_req_sub *
 dtrq_sub_lookup(struct distribute_txn_replay_req *dtrq, __u32 mdt_index);
-
+struct distribute_txn_replay_req *
+distribute_txn_lookup_finish_list(struct target_distribute_txn_data *tdtd,
+				  __u64 transno);
+bool is_req_replayed_by_update(struct ptlrpc_request *req);
 enum {
 	ESERIOUS = 0x0001000
 };