X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=9285a1f877c34d58a94ae87d8b438ed32e220375;hb=6b557f04e55b14e11b7fce310094e71331c8b204;hp=1667d0d7677517df1a7679eca57296814c9b31c6;hpb=c978ae6785bd9c18cecdff486fabaec405c7835f;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index 1667d0d..9285a1f 100644
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -49,7 +49,7 @@
 #define OFD_ROCOMPAT_SUPP (0)
 #define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \
 			   OBD_INCOMPAT_COMMON_LR)
-#define OFD_PRECREATE_BATCH_DEFAULT (FILTER_SUBDIR_COUNT * 4)
+#define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4)
 
 /* on small filesystems we should not precreate too many objects in
  * a single transaction, otherwise we can overflow transactions */
@@ -72,6 +72,8 @@ struct ofd_mod_data {
 #define OFD_FMD_MAX_NUM_DEFAULT 128
 #define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ)
 
+#define OFD_SOFT_SYNC_LIMIT_DEFAULT 16
+
 /* request stats */
 enum {
 	LPROC_OFD_STATS_READ = 0,
@@ -124,9 +126,6 @@ struct ofd_device {
 	/* DLM name-space for meta-data locks maintained by this server */
 	struct ldlm_namespace	*ofd_namespace;
 
-	/* transaction callbacks */
-	struct dt_txn_callback	 ofd_txn_cb;
-
 	/* last_rcvd file */
 	struct lu_target	 ofd_lut;
 	struct dt_object	*ofd_health_check_file;
@@ -184,6 +183,8 @@ struct ofd_device {
 				  * supporting OBD_CONNECT_GRANT_PARAM? */
 				 ofd_grant_compat_disable:1;
 	struct seq_server_site	 ofd_seq_site;
+	/* the limit of SOFT_SYNC RPCs that will trigger a soft sync */
+	unsigned int		 ofd_soft_sync_limit;
 };
 
 static inline struct ofd_device *ofd_dev(struct lu_device *d)
@@ -290,10 +291,7 @@ struct ofd_thread_info {
 
 	struct obd_export		*fti_exp;
 	__u64				 fti_xid;
-	__u64				 fti_transno;
 	__u64				 fti_pre_version;
-	__u32				 fti_has_trans:1, /* has txn already */
-					 fti_mult_trans:1;
 
 	struct lu_fid			 fti_fid;
 	struct lu_attr			 fti_attr;
@@ -541,8 +539,6 @@ static inline struct ofd_thread_info *ofd_info_init(const struct lu_env *env,
 	info->fti_env = env;
 	info->fti_exp = exp;
 	info->fti_pre_version = 0;
-	info->fti_transno = 0;
-	info->fti_has_trans = 0;
 	return info;
 }
 
@@ -558,7 +554,6 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi)
 
 	info->fti_env = tsi->tsi_env;
 	info->fti_exp = tsi->tsi_exp;
-	info->fti_has_trans = 0;
 
 	info->fti_xid = req->rq_xid;
 	/** VBR: take versions from request */
@@ -567,7 +562,6 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi)
 		__u64 *pre_version = lustre_msg_get_versions(req->rq_reqmsg);
 
 		info->fti_pre_version = pre_version ? pre_version[0] : 0;
-		info->fti_transno = lustre_msg_get_transno(req->rq_reqmsg);
 	}
 	return info;
 }
@@ -576,7 +570,6 @@ static inline void ofd_oti2info(struct ofd_thread_info *info,
 				struct obd_trans_info *oti)
 {
 	info->fti_xid = oti->oti_xid;
-	info->fti_transno = oti->oti_transno;
 	info->fti_pre_version = oti->oti_pre_version;
 }
 
@@ -584,11 +577,6 @@ static inline void ofd_info2oti(struct ofd_thread_info *info,
                                 struct obd_trans_info *oti)
 {
 	oti->oti_xid = info->fti_xid;
-	LASSERTF(ergo(oti->oti_transno > 0,
-		      oti->oti_transno == info->fti_transno),
-		 "Overwrite replay transno "LPX64" by "LPX64"\n",
-		 oti->oti_transno, info->fti_transno);
-	oti->oti_transno = info->fti_transno;
 	oti->oti_pre_version = info->fti_pre_version;
 }