X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosp%2Fosp_object.c;h=aef4b87d1f9a2773b68bbb69b9cfe0b1f5c4856e;hp=61a7588fd10fb32d47f3da876031c5d06c3e17e8;hb=3ac7c325efaf3a2537fafc79168d87de67982acd;hpb=5165cdd4b063d523e5ae261f47818b5ba2bbc7cc

diff --git a/lustre/osp/osp_object.c b/lustre/osp/osp_object.c
index 61a7588..aef4b87 100644
--- a/lustre/osp/osp_object.c
+++ b/lustre/osp/osp_object.c
@@ -171,6 +171,12 @@ static int osp_declare_object_create(const struct lu_env *env,
 
 	ENTRY;
 
+	/* should happen to non-0 OSP only so that at least one object
+	 * has been already declared in the scenario and LOD should
+	 * cleanup that */
+	if (OBD_FAIL_CHECK(OBD_FAIL_MDS_OSC_CREATE_FAIL) && d->opd_index == 1)
+		RETURN(-ENOSPC);
+
 	LASSERT(d->opd_last_used_file);
 	fid = lu_object_fid(&dt->do_lu);
 
@@ -214,7 +220,7 @@ static int osp_declare_object_create(const struct lu_env *env,
 					     th);
 	} else {
 		/* not needed in the cache anymore */
-		cfs_set_bit(LU_OBJECT_HEARD_BANSHEE,
+		set_bit(LU_OBJECT_HEARD_BANSHEE,
 			    &dt->do_lu.lo_header->loh_flags);
 	}
 	RETURN(rc);
@@ -241,9 +247,9 @@ static int osp_object_create(const struct lu_env *env, struct dt_object *dt,
 		rc = fid_ostid_pack(lu_object_fid(&dt->do_lu), &osi->osi_oi);
 		LASSERT(rc == 0);
 		osi->osi_id = ostid_id(&osi->osi_oi);
-		cfs_spin_lock(&d->opd_pre_lock);
+		spin_lock(&d->opd_pre_lock);
 		osp_update_last_id(d, osi->osi_id);
-		cfs_spin_unlock(&d->opd_pre_lock);
+		spin_unlock(&d->opd_pre_lock);
 	}
 
 	LASSERT(osi->osi_id);
@@ -257,20 +263,20 @@ static int osp_object_create(const struct lu_env *env, struct dt_object *dt,
 
 	/* we might have lost precreated objects */
 	if (unlikely(d->opd_gap_count) > 0) {
-		cfs_spin_lock(&d->opd_pre_lock);
+		spin_lock(&d->opd_pre_lock);
 		if (d->opd_gap_count > 0) {
 			int count = d->opd_gap_count;
 
 			osi->osi_oi.oi_id = d->opd_gap_start;
 			d->opd_gap_count = 0;
-			cfs_spin_unlock(&d->opd_pre_lock);
+			spin_unlock(&d->opd_pre_lock);
 
 			CDEBUG(D_HA, "Found gap "LPU64"+%d in objids\n",
 			       d->opd_gap_start, count);
 			/* real gap handling is disabled intil ORI-692 will be
 			 * fixed, now we only report gaps */
 		} else {
-			cfs_spin_unlock(&d->opd_pre_lock);
+			spin_unlock(&d->opd_pre_lock);
 		}
 	}
 
@@ -282,6 +288,9 @@ static int osp_object_create(const struct lu_env *env, struct dt_object *dt,
 	rc = dt_record_write(env, d->opd_last_used_file, &osi->osi_lb,
 			     &osi->osi_off, th);
 
+	CDEBUG(D_HA, "%s: Wrote last used ID: "LPU64": %d\n",
+	       d->opd_obd->obd_name, le64_to_cpu(d->opd_last_used_id), rc);
+
 	RETURN(rc);
 }
 
@@ -316,7 +325,7 @@ static int osp_object_destroy(const struct lu_env *env, struct dt_object *dt,
 	rc = osp_sync_add(env, o, MDS_UNLINK64_REC, th, NULL);
 
 	/* not needed in cache any more */
-	cfs_set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
+	set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
 
 	RETURN(rc);
 }
@@ -363,12 +372,12 @@ static void osp_object_release(const struct lu_env *env, struct lu_object *o)
 	 */
 	if (unlikely(po->opo_reserved)) {
 		LASSERT(d->opd_pre_reserved > 0);
-		cfs_spin_lock(&d->opd_pre_lock);
+		spin_lock(&d->opd_pre_lock);
 		d->opd_pre_reserved--;
-		cfs_spin_unlock(&d->opd_pre_lock);
+		spin_unlock(&d->opd_pre_lock);
 
 		/* not needed in cache any more */
-		cfs_set_bit(LU_OBJECT_HEARD_BANSHEE, &o->lo_header->loh_flags);
+		set_bit(LU_OBJECT_HEARD_BANSHEE, &o->lo_header->loh_flags);
 	}
 	EXIT;
 }