X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_osd.c;h=54f3dd46f217575ab37e78d54b93bd53a69caaca;hp=fc0b16f4d837d3eb9d40c0d970696a094b81a4e6;hb=d6bd5e9cc49b3bb9901ada503107e8b0eca44f7e;hpb=7c99f67d9d39e8a037e830cf08a9df305e6d8da2

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index fc0b16f..54f3dd4 100644
--- a/lustre/obdclass/llog_osd.c
+++ b/lustre/obdclass/llog_osd.c
@@ -126,8 +126,7 @@ static int llog_osd_create_new_object(const struct lu_env *env,
 static int llog_osd_exist(struct llog_handle *handle)
 {
 	LASSERT(handle->lgh_obj);
-	return dt_object_exists(handle->lgh_obj) &&
-		!lu_object_is_dying(handle->lgh_obj->do_lu.lo_header);
+	return dt_object_exists(handle->lgh_obj) && !handle->lgh_destroyed;
 }
 
 static void *rec_tail(struct llog_rec_hdr *rec)
@@ -903,7 +902,7 @@ static int llog_osd_next_block(const struct lu_env *env,
 
 	o = loghandle->lgh_obj;
 	LASSERT(o);
-	LASSERT(dt_object_exists(o));
+	LASSERT(llog_osd_exist(loghandle));
 	dt = lu2dt_dev(o->do_lu.lo_dev);
 	LASSERT(dt);
 
@@ -1077,7 +1076,7 @@ static int llog_osd_prev_block(const struct lu_env *env,
 
 	o = loghandle->lgh_obj;
 	LASSERT(o);
-	LASSERT(dt_object_exists(o));
+	LASSERT(llog_osd_exist(loghandle));
 	dt = lu2dt_dev(o->do_lu.lo_dev);
 	LASSERT(dt);
 
@@ -1800,7 +1799,7 @@ static int llog_osd_destroy(const struct lu_env *env,
 	LASSERT(o != NULL);
 
 	dt_write_lock(env, o, 0);
-	if (!dt_object_exists(o))
+	if (!llog_osd_exist(loghandle))
 		GOTO(out_unlock, rc = 0);
 
 	if (loghandle->lgh_name) {
@@ -1826,6 +1825,7 @@ static int llog_osd_destroy(const struct lu_env *env,
 	if (rc < 0)
 		GOTO(out_unlock, rc);
 
+	loghandle->lgh_destroyed = true;
 	if (loghandle->lgh_ctxt->loc_flags & LLOG_CTXT_FLAG_NORMAL_FID) {
 		rc = llog_osd_regular_fid_del_name_entry(env, o, th, false);
 		if (rc < 0)