X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_io.c;h=d8bef11668ff84cf811f9603d5677960a4031710;hb=3120c92d0581d884d29f428dbf8eb9d7dfab97b0;hp=cdc5940e32bb313d5391b8726296356c5c42fdad;hpb=d46286bdfb704cc56972863cb067244b8bb6df43;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index cdc5940..d8bef11 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;
@@ -155,7 +150,7 @@ static int ofd_inconsistency_verification_main(void *args)
 		GOTO(out, rc = -ENOMEM);
 
 	lr->lr_event = LE_PAIRS_VERIFY;
-	lr->lr_active = LT_LAYOUT;
+	lr->lr_active = LFSCK_TYPE_LAYOUT;
 
 	spin_lock(&ofd->ofd_inconsistency_lock);
 	while (1) {
@@ -233,7 +228,7 @@ int ofd_start_inconsistency_verification_thread(struct ofd_device *ofd)
 	if (IS_ERR(task)) {
 		rc = PTR_ERR(task);
 		CERROR("%s: cannot start self_repair thread: rc = %d\n",
-		       ofd_obd(ofd)->obd_name, rc);
+		       ofd_name(ofd), rc);
 	} else {
 		rc = 0;
 		l_wait_event(thread->t_ctl_waitq,
@@ -275,16 +270,8 @@ static void ofd_add_inconsistency_item(const struct lu_env *env,
 	bool				 wakeup = false;
 
 	OBD_ALLOC_PTR(oii);
-	if (oii == NULL) {
-		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),
-		       oa->o_parent_seq, oa->o_parent_oid, oa->o_stripe_idx,
-		       PFID(&fo->ofo_pfid));
-
+	if (oii == NULL)
 		return;
-	}
 
 	INIT_LIST_HEAD(&oii->oii_list);
 	lu_object_get(&fo->ofo_obj.do_lu);
@@ -589,7 +576,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;
@@ -812,9 +799,8 @@ static int ofd_soft_sync_cb_add(struct thandle *th, struct obd_export *exp)
 
 	dcb = &ossc->ossc_cb;
 	dcb->dcb_func = ofd_cb_soft_sync;
-	CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
-	strncpy(dcb->dcb_name, "ofd_cb_soft_sync", MAX_COMMIT_CB_STR_LEN);
-	dcb->dcb_name[MAX_COMMIT_CB_STR_LEN - 1] = '\0';
+	INIT_LIST_HEAD(&dcb->dcb_linkage);
+	strlcpy(dcb->dcb_name, "ofd_cb_soft_sync", sizeof(dcb->dcb_name));
 
 	rc = dt_trans_cb_add(th, dcb);
 	if (rc) {
@@ -1030,8 +1016,8 @@ int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
 			ost_fid_build_resid(fid, &info->fti_resid);
 			rs = ldlm_resource_get(ns, NULL, &info->fti_resid,
 					       LDLM_EXTENT, 0);
-			if (rs != NULL) {
-				ns->ns_lvbo->lvbo_update(rs, NULL, 1);
+			if (!IS_ERR(rs)) {
+				ldlm_res_lvbo_update(rs, NULL, 1);
 				ldlm_resource_putref(rs);
 			}
 		}