X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_objects.c;h=c1d8c620ad04aa07575a83d00e5aaaae080999b8;hb=424fa1bff070d0382c3ad5073361972088331857;hp=8423734d9bca8a1bf6028e0835b4ac46a257a1aa;hpb=8a7ce3cf279d8742edf219dd96c48c7882a57f4e;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_objects.c b/lustre/ofd/ofd_objects.c
index 8423734..c1d8c62 100644
--- a/lustre/ofd/ofd_objects.c
+++ b/lustre/ofd/ofd_objects.c
@@ -379,7 +379,7 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 	  * To make above mechanism to work, before OFD pre-create OST-objects,
 	  * it needs to update the LAST_ID file firstly, otherwise, the LFSCK
 	  * may cannot get latest last_id although new OST-object created. */
-	if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_SKIP_LASTID)) {
+	if (!CFS_FAIL_CHECK(OBD_FAIL_LFSCK_SKIP_LASTID)) {
 		tmp = cpu_to_le64(id + nr - 1);
 		dt_write_lock(env, oseq->os_lastid_obj, DT_LASTID);
 		rc = dt_record_write(env, oseq->os_lastid_obj,
@@ -405,7 +405,7 @@ int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
 		}
 
 		if (likely(!ofd_object_exists(fo) &&
-			   !OBD_FAIL_CHECK(OBD_FAIL_LFSCK_DANGLING))) {
+			   !CFS_FAIL_CHECK(OBD_FAIL_LFSCK_DANGLING))) {
 			next = ofd_object_child(fo);
 			LASSERT(next != NULL);
 
@@ -714,11 +714,11 @@ int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
 		GOTO(unlock, rc = fl);
 
 	if (fl) {
-		if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+		if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
 			ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
-		else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+		else if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
 			le32_add_cpu(&ff->ff_parent.f_oid, -1);
-		else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+		else if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
 			GOTO(unlock, rc);
 
 		info->fti_buf.lb_buf = ff;
@@ -968,11 +968,11 @@ int ofd_object_punch(const struct lu_env *env, struct ofd_object *fo,
 		GOTO(unlock, rc);
 
 	if (fl) {
-		if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+		if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
 			ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
-		else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+		else if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
 			le32_add_cpu(&ff->ff_parent.f_oid, -1);
-		else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+		else if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
 			GOTO(unlock, rc);
 
 		info->fti_buf.lb_buf = ff;