X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flod%2Flod_dev.c;h=9ab7972b52860e5413efb3bcdb94a8e0d4e3de48;hb=3fc039a99f41725798d157a422174005a49200c8;hp=e36aee1d59d7d1f1c90377ff2ef0e2a4d150b807;hpb=4e28733e8d4c6c2dad278cfedb0777ce6bddebfb;p=fs%2Flustre-release.git

diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c
index e36aee1..9ab7972 100644
--- a/lustre/lod/lod_dev.c
+++ b/lustre/lod/lod_dev.c
@@ -57,7 +57,7 @@
  * \param type indidcate the FID is on MDS or OST.
  **/
 int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
-		   const struct lu_fid *fid, __u32 *tgt, int type)
+		   const struct lu_fid *fid, __u32 *tgt, int *type)
 {
 	struct lu_seq_range	range = { 0 };
 	struct lu_server_fld	*server_fld;
@@ -65,24 +65,29 @@ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
 	ENTRY;
 
 	LASSERTF(fid_is_sane(fid), "Invalid FID "DFID"\n", PFID(fid));
+
 	if (fid_is_idif(fid)) {
 		*tgt = fid_idif_ost_idx(fid);
+		*type = LU_SEQ_RANGE_OST;
 		RETURN(rc);
 	}
 
 	if (!lod->lod_initialized || (!fid_seq_in_fldb(fid_seq(fid)))) {
 		LASSERT(lu_site2seq(lod2lu_dev(lod)->ld_site) != NULL);
+
 		*tgt = lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_node_id;
+		*type = LU_SEQ_RANGE_MDT;
 		RETURN(rc);
 	}
 
 	server_fld = lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_server_fld;
-	fld_range_set_type(&range, type);
+	fld_range_set_type(&range, *type);
 	rc = fld_server_lookup(env, server_fld, fid_seq(fid), &range);
 	if (rc)
 		RETURN(rc);
 
 	*tgt = range.lsr_index;
+	*type = range.lsr_flags;
 
 	CDEBUG(D_INFO, "LOD: got tgt %x for sequence: "
 	       LPX64"\n", *tgt, fid_seq(fid));
@@ -91,7 +96,6 @@ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
 }
 
 extern struct lu_object_operations lod_lu_obj_ops;
-extern struct lu_object_operations lod_lu_robj_ops;
 extern struct dt_object_operations lod_obj_ops;
 
 /* Slab for OSD object allocation */
@@ -117,29 +121,17 @@ struct lu_object *lod_object_alloc(const struct lu_env *env,
 {
 	struct lod_object	*lod_obj;
 	struct lu_object	*lu_obj;
-	const struct lu_fid	*fid = &hdr->loh_fid;
-	mdsno_t			mds;
-	int			rc = 0;
 	ENTRY;
 
-	OBD_SLAB_ALLOC_PTR_GFP(lod_obj, lod_object_kmem, __GFP_IO);
+	OBD_SLAB_ALLOC_PTR_GFP(lod_obj, lod_object_kmem, GFP_NOFS);
 	if (lod_obj == NULL)
 		RETURN(ERR_PTR(-ENOMEM));
 
-	rc = lod_fld_lookup(env, lu2lod_dev(dev), fid, &mds, LU_SEQ_RANGE_MDT);
-	if (rc) {
-		OBD_SLAB_FREE_PTR(lod_obj, lod_object_kmem);
-		RETURN(ERR_PTR(rc));
-	}
-
-	lod_obj->ldo_mds_num = mds;
 	lu_obj = lod2lu_obj(lod_obj);
 	dt_object_init(&lod_obj->ldo_obj, NULL, dev);
 	lod_obj->ldo_obj.do_ops = &lod_obj_ops;
-	if (likely(mds == lu_site2seq(dev->ld_site)->ss_node_id))
-		lu_obj->lo_ops = &lod_lu_obj_ops;
-	else
-		lu_obj->lo_ops = &lod_lu_robj_ops;
+	lu_obj->lo_ops = &lod_lu_obj_ops;
+
 	RETURN(lu_obj);
 }
 
@@ -290,19 +282,17 @@ static int lod_process_config(const struct lu_env *env,
 		} else {
 			rc = lod_del_device(env, lod,
 					    &lod->lod_ost_descs,
-					    arg1, index, gen);
+					    arg1, index, gen, true);
 		}
 
 		break;
 	}
 
 	case LCFG_PARAM: {
-		struct lprocfs_static_vars  v = { 0 };
-		struct obd_device	  *obd = lod2obd(lod);
-
-		lprocfs_lod_init_vars(&v);
+		struct obd_device *obd = lod2obd(lod);
 
-		rc = class_process_proc_param(PARAM_LOV, v.obd_vars, lcfg, obd);
+		rc = class_process_proc_seq_param(PARAM_LOV, obd->obd_vars,
+						  lcfg, obd);
 		if (rc > 0)
 			rc = 0;
 		GOTO(out, rc);
@@ -418,71 +408,54 @@ static struct thandle *lod_trans_create(const struct lu_env *env,
 	if (IS_ERR(th))
 		return th;
 
-	CFS_INIT_LIST_HEAD(&th->th_remote_update_list);
 	return th;
 }
 
-static int lod_remote_sync(const struct lu_env *env, struct dt_device *dev,
-			   struct thandle *th)
-{
-	struct update_request *update;
-	int    rc = 0;
-	ENTRY;
-
-	if (cfs_list_empty(&th->th_remote_update_list))
-		RETURN(0);
-
-	cfs_list_for_each_entry(update, &th->th_remote_update_list,
-				ur_list) {
-		/* In DNE phase I, there should be only one OSP
-		 * here, so we will do send/receive one by one,
-		 * instead of sending them parallel, will fix this
-		 * in Phase II */
-		th->th_current_request = update;
-		rc = dt_trans_start(env, update->ur_dt, th);
-		if (rc != 0) {
-			/* FIXME how to revert the partial results
-			 * once error happened? Resolved by 2 Phase commit */
-			update->ur_rc = rc;
-			break;
-		}
-	}
-
-	RETURN(rc);
-}
-
 static int lod_trans_start(const struct lu_env *env, struct dt_device *dev,
 			   struct thandle *th)
 {
 	struct lod_device *lod = dt2lod_dev((struct dt_device *) dev);
-	int rc;
+	int rc = 0;
 
-	rc = lod_remote_sync(env, dev, th);
-	if (rc)
-		return rc;
+	if (unlikely(th->th_update != NULL)) {
+		struct thandle_update *tu = th->th_update;
+		struct dt_update_request *update;
 
+		list_for_each_entry(update, &tu->tu_remote_update_list,
+				    dur_list) {
+			LASSERT(update->dur_dt != NULL);
+			rc = dt_trans_start(env, update->dur_dt, th);
+			if (rc != 0)
+				return rc;
+		}
+	}
 	return dt_trans_start(env, lod->lod_child, th);
 }
 
-static int lod_trans_stop(const struct lu_env *env, struct thandle *th)
+static int lod_trans_stop(const struct lu_env *env, struct dt_device *dt,
+			  struct thandle *th)
 {
-	struct update_request *update;
-	struct update_request *tmp;
-	int rc = 0;
-	int rc2 = 0;
+	struct thandle_update		*tu = th->th_update;
+	struct dt_update_request	*update;
+	struct dt_update_request	*tmp;
+	int				rc2 = 0;
+	int				rc;
+	ENTRY;
+
+	rc = dt_trans_stop(env, th->th_dev, th);
+	if (likely(tu == NULL))
+		RETURN(rc);
 
-	cfs_list_for_each_entry_safe(update, tmp,
-				     &th->th_remote_update_list,
-				     ur_list) {
-		th->th_current_request = update;
-		rc2 = dt_trans_stop(env, update->ur_dt, th);
+	list_for_each_entry_safe(update, tmp,
+				 &tu->tu_remote_update_list,
+				 dur_list) {
+		/* update will be freed inside dt_trans_stop */
+		rc2 = dt_trans_stop(env, update->dur_dt, th);
 		if (unlikely(rc2 != 0 && rc == 0))
 			rc = rc2;
 	}
 
-	rc2 = dt_trans_stop(env, th->th_dev, th);
-
-	return rc2 != 0 ? rc2 : rc;
+	RETURN(rc);
 }
 
 static void lod_conf_get(const struct lu_env *env,
@@ -708,7 +681,7 @@ static struct lu_device *lod_device_free(const struct lu_env *env,
 	struct lu_device  *next = &lod->lod_child->dd_lu_dev;
 	ENTRY;
 
-	LASSERT(cfs_atomic_read(&lu->ld_ref) == 0);
+	LASSERT(atomic_read(&lu->ld_ref) == 0);
 	dt_device_fini(&lod->lod_dt_dev);
 	OBD_FREE_PTR(lod);
 	RETURN(next);
@@ -750,12 +723,12 @@ static struct lu_device *lod_device_fini(const struct lu_env *env,
 
 	lod_procfs_fini(lod);
 
-	rc = lod_fini_tgt(lod, &lod->lod_ost_descs);
+	rc = lod_fini_tgt(env, lod, &lod->lod_ost_descs, true);
 	if (rc)
 		CERROR("%s:can not fini ost descs %d\n",
 			lod2obd(lod)->obd_name, rc);
 
-	rc = lod_fini_tgt(lod, &lod->lod_mdt_descs);
+	rc = lod_fini_tgt(env, lod, &lod->lod_mdt_descs, false);
 	if (rc)
 		CERROR("%s:can not fini mdt descs %d\n",
 			lod2obd(lod)->obd_name, rc);
@@ -841,6 +814,7 @@ static void lod_key_fini(const struct lu_context *ctx,
 		info->lti_ea_store = NULL;
 		info->lti_ea_store_size = 0;
 	}
+	lu_buf_free(&info->lti_linkea_buf);
 	OBD_FREE_PTR(info);
 }
 
@@ -916,44 +890,41 @@ static struct obd_ops lod_obd_device_ops = {
 
 static int __init lod_mod_init(void)
 {
-	struct lprocfs_static_vars  lvars = { 0 };
-	cfs_proc_dir_entry_t       *lov_proc_dir;
-	int			    rc;
+	struct obd_type	*type;
+	int rc;
 
 	rc = lu_kmem_init(lod_caches);
 	if (rc)
 		return rc;
 
-	lprocfs_lod_init_vars(&lvars);
-
-	rc = class_register_type(&lod_obd_device_ops, NULL, NULL,
+	rc = class_register_type(&lod_obd_device_ops, NULL, true, NULL,
 #ifndef HAVE_ONLY_PROCFS_SEQ
-				lvars.module_vars,
+				 NULL,
 #endif
-				LUSTRE_LOD_NAME, &lod_device_type);
+				 LUSTRE_LOD_NAME, &lod_device_type);
 	if (rc) {
 		lu_kmem_fini(lod_caches);
 		return rc;
 	}
 
 	/* create "lov" entry in procfs for compatibility purposes */
-	lov_proc_dir = lprocfs_srch(proc_lustre_root, "lov");
-	if (lov_proc_dir == NULL) {
-		lov_proc_dir = lprocfs_register("lov", proc_lustre_root,
-						NULL, NULL);
-		if (IS_ERR(lov_proc_dir))
-			CERROR("lod: can't create compat entry \"lov\": %d\n",
-			       (int)PTR_ERR(lov_proc_dir));
-	}
+	type = class_search_type(LUSTRE_LOV_NAME);
+	if (type != NULL && type->typ_procroot != NULL)
+		return rc;
 
+	type = class_search_type(LUSTRE_LOD_NAME);
+	type->typ_procsym = lprocfs_seq_register("lov", proc_lustre_root,
+						 NULL, NULL);
+	if (IS_ERR(type->typ_procsym)) {
+		CERROR("lod: can't create compat entry \"lov\": %d\n",
+		       (int)PTR_ERR(type->typ_procsym));
+		type->typ_procsym = NULL;
+	}
 	return rc;
 }
 
 static void __exit lod_mod_exit(void)
 {
-
-	lprocfs_try_remove_proc_entry("lov", proc_lustre_root);
-
 	class_unregister_type(LUSTRE_LOD_NAME);
 	lu_kmem_fini(lod_caches);
 }