X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fofd%2Fofd_io.c;h=6b2d48f81dd94a5bf817b8ffd3e62067daa36c1b;hb=14d162c5438de959d0ea01fb1b40a7c5dfa764d1;hp=96811b7e3fdea601b5e7ce7e9b89f01a484da9a4;hpb=46e82c4644108eac92ac7c813c16bd7dd3283a56;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index 96811b7..6b2d48f 100644
--- a/lustre/ofd/ofd_io.c
+++ b/lustre/ofd/ofd_io.c
@@ -74,8 +74,7 @@ static void ofd_inconsistency_verify_one(const struct lu_env *env,
 			CDEBUG(D_LFSCK, "%s: fail to verify OST local stored "
 			       "PFID xattr for "DFID", the client given PFID "
 			       DFID", OST local stored PFID "DFID": rc = %d\n",
-			       ofd_obd(ofd)->obd_name,
-			       PFID(&fo->ofo_header.loh_fid),
+			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid), rc);
 		else
 			fo->ofo_pfid_verified = 1;
@@ -88,16 +87,14 @@ static void ofd_inconsistency_verify_one(const struct lu_env *env,
 			CDEBUG(D_LFSCK, "%s: fail to verify the client given "
 			       "PFID for "DFID", the client given PFID "DFID
 			       ", local stored PFID "DFID": rc = %d\n",
-			       ofd_obd(ofd)->obd_name,
-			       PFID(&fo->ofo_header.loh_fid),
+			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid), rc);
 		else
 			CDEBUG(D_LFSCK, "%s: both the client given PFID and "
 			       "the OST local stored PFID are stale for the "
 			       "OST-object "DFID", client given PFID is "DFID
 			       ", local stored PFID is "DFID"\n",
-			       ofd_obd(ofd)->obd_name,
-			       PFID(&fo->ofo_header.loh_fid),
+			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid));
 		break;
 	case LPVS_INCONSISTENT_TOFIX:
@@ -107,15 +104,13 @@ static void ofd_inconsistency_verify_one(const struct lu_env *env,
 			CDEBUG(D_LFSCK, "%s: fixed the staled OST PFID xattr "
 			       "for "DFID", with the client given PFID "DFID
 			       ", the old stored PFID "DFID"\n",
-			       ofd_obd(ofd)->obd_name,
-			       PFID(&fo->ofo_header.loh_fid),
+			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid));
 		} else {
 			CDEBUG(D_LFSCK, "%s: fail to fix the OST PFID xattr "
 			       "for "DFID", client given PFID "DFID", local "
 			       "stored PFID "DFID": rc = %d\n",
-			       ofd_obd(ofd)->obd_name,
-			       PFID(&fo->ofo_header.loh_fid),
+			       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 			       PFID(&oii->oii_pfid), PFID(pfid), rc);
 		}
 		*pfid = oii->oii_pfid;
@@ -216,7 +211,8 @@ int ofd_start_inconsistency_verification_thread(struct ofd_device *ofd)
 {
 	struct ptlrpc_thread	*thread = &ofd->ofd_inconsistency_thread;
 	struct l_wait_info	 lwi	= { 0 };
-	long			 rc;
+	struct task_struct	*task;
+	int			 rc;
 
 	spin_lock(&ofd->ofd_inconsistency_lock);
 	if (unlikely(thread_is_running(thread))) {
@@ -227,11 +223,12 @@ int ofd_start_inconsistency_verification_thread(struct ofd_device *ofd)
 
 	thread_set_flags(thread, 0);
 	spin_unlock(&ofd->ofd_inconsistency_lock);
-	rc = PTR_ERR(kthread_run(ofd_inconsistency_verification_main, ofd,
-				 "inconsistency_verification"));
-	if (IS_ERR_VALUE(rc)) {
-		CERROR("%s: cannot start self_repair thread: rc = %ld\n",
-		       ofd_obd(ofd)->obd_name, rc);
+	task = kthread_run(ofd_inconsistency_verification_main, ofd,
+			   "inconsistency_verification");
+	if (IS_ERR(task)) {
+		rc = PTR_ERR(task);
+		CERROR("%s: cannot start self_repair thread: rc = %d\n",
+		       ofd_name(ofd), rc);
 	} else {
 		rc = 0;
 		l_wait_event(thread->t_ctl_waitq,
@@ -277,7 +274,7 @@ static void ofd_add_inconsistency_item(const struct lu_env *env,
 		CERROR("%s: cannot alloc memory for verify OST-object "
 		       "consistency for "DFID", client given PFID "DFID
 		       ", local stored PFID "DFID"\n",
-		       ofd_obd(ofd)->obd_name, PFID(&fo->ofo_header.loh_fid),
+		       ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
 		       oa->o_parent_seq, oa->o_parent_oid, oa->o_stripe_idx,
 		       PFID(&fo->ofo_pfid));
 
@@ -587,7 +584,7 @@ int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
 		LASSERT(oti != NULL);
 		info = ofd_info_init(env, exp);
 		ofd_oti2info(info, oti);
-		jobid = oti->oti_jobid;
+		jobid = NULL;
 	} else {
 		info = tsi2ofd_info(tsi);
 		jobid = tsi->tsi_jobid;