X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosp%2Fosp_precreate.c;h=11dd60ccb525fb45ad54ea938acf10ce0fdae97c;hb=11db1a551172f596d1d284e8496530f9ce24ac81;hp=914f988d7d4f76b502000e465af0a3a43228814e;hpb=6794d7654b4c459519a9e6d85ed439c8c594c2e7;p=fs%2Flustre-release.git

diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c
index 914f988..11dd60c 100644
--- a/lustre/osp/osp_precreate.c
+++ b/lustre/osp/osp_precreate.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,9 +42,6 @@
  * Author: Di Wang <di.wang@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include "osp_internal.h"
@@ -872,15 +869,11 @@ static int osp_precreate_thread(void *_arg)
 	struct osp_device	*d = _arg;
 	struct ptlrpc_thread	*thread = &d->opd_pre_thread;
 	struct l_wait_info	 lwi = { 0 };
-	char			 pname[16];
 	struct lu_env		 env;
 	int			 rc;
 
 	ENTRY;
 
-	sprintf(pname, "osp-pre-%u", d->opd_index);
-	cfs_daemonize(pname);
-
 	rc = lu_env_init(&env, d->opd_dt_dev.dd_lu_dev.ld_type->ldt_ctx_tags);
 	if (rc) {
 		CERROR("%s: init env error: rc = %d\n", d->opd_obd->obd_name,
@@ -1044,7 +1037,6 @@ int osp_precreate_reserve(const struct lu_env *env, struct osp_device *d)
 	struct l_wait_info	 lwi;
 	cfs_time_t		 expire = cfs_time_shift(obd_timeout);
 	int			 precreated, rc;
-	int			 count = 0;
 
 	ENTRY;
 
@@ -1062,17 +1054,6 @@ int osp_precreate_reserve(const struct lu_env *env, struct osp_device *d)
 	while ((rc = d->opd_pre_status) == 0 || rc == -ENOSPC ||
 		rc == -ENODEV || rc == -EAGAIN) {
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 90, 0)
-		/*
-		 * to address Andreas's concern on possible busy-loop
-		 * between this thread and osp_precreate_send()
-		 */
-		if (unlikely(count++ == 1000)) {
-			osp_precreate_timeout_condition(d);
-			LBUG();
-		}
-#endif
-
 		/*
 		 * increase number of precreations
 		 */
@@ -1231,7 +1212,7 @@ int osp_object_truncate(const struct lu_env *env, struct dt_object *dt,
 
 	body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
 	LASSERT(body);
-	lustre_set_wire_obdo(&body->oa, oa);
+	lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa, oa);
 
 	/* XXX: capa support? */
 	/* osc_pack_capa(req, body, capa); */
@@ -1251,7 +1232,7 @@ out:
 int osp_init_precreate(struct osp_device *d)
 {
 	struct l_wait_info	 lwi = { 0 };
-	int			 rc;
+	cfs_task_t		*task;
 
 	ENTRY;
 
@@ -1286,10 +1267,11 @@ int osp_init_precreate(struct osp_device *d)
 	/*
 	 * start thread handling precreation and statfs updates
 	 */
-	rc = cfs_create_thread(osp_precreate_thread, d, 0);
-	if (rc < 0) {
-		CERROR("can't start precreate thread %d\n", rc);
-		RETURN(rc);
+	task = kthread_run(osp_precreate_thread, d,
+			       "osp-pre-%u", d->opd_index);
+	if (IS_ERR(task)) {
+		CERROR("can't start precreate thread %ld\n", PTR_ERR(task));
+		RETURN(PTR_ERR(task));
 	}
 
 	l_wait_event(d->opd_pre_thread.t_ctl_waitq,