X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_dev.c;h=4cafa486784ac18346c1226de07fb96f1893a9d5;hb=730a204e73667403e299936fafa0d3eb45099709;hp=6782e5dc6908b39030a701760492b6285952d354;hpb=b6a1b9470e7acccd731d97b7c9409a9f61befb0c;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 6782e5d..4cafa48 100644
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -362,7 +362,7 @@ static struct lu_object *ofd_object_alloc(const struct lu_env *env,
 
 	ENTRY;
 
-	OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, __GFP_IO);
+	OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, GFP_NOFS);
 	if (of != NULL) {
 		struct lu_object	*o;
 		struct lu_object_header *h;
@@ -442,7 +442,11 @@ static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
 		RETURN(rc);
 	}
 
-	lsp.lsp_namespace = ofd->ofd_namespace;
+	rc = lfsck_register_namespace(env, ofd->ofd_osd, ofd->ofd_namespace);
+	/* The LFSCK instance is registered just now, so it must be there when
+	 * register the namespace to such instance. */
+	LASSERTF(rc == 0, "register namespace failed: rc = %d\n", rc);
+
 	lsp.lsp_start = NULL;
 	lsp.lsp_index_valid = 0;
 	rc = lfsck_start(env, ofd->ofd_osd, &lsp);
@@ -1652,7 +1656,7 @@ static int ofd_punch_hdl(struct tgt_session_info *tsi)
 	}
 
 	rc = ofd_object_punch(tsi->tsi_env, fo, start, end, &info->fti_attr,
-			      ff);
+			      ff, (struct obdo *)oa);
 	if (rc)
 		GOTO(out_put, rc);
 
@@ -2059,8 +2063,8 @@ static struct tgt_opc_slice ofd_common_slice[] = {
 		.tos_hs		= tgt_dlm_handlers
 	},
 	{
-		.tos_opc_start	= UPDATE_OBJ,
-		.tos_opc_end	= UPDATE_LAST_OPC,
+		.tos_opc_start	= OUT_UPDATE_FIRST_OPC,
+		.tos_opc_end	= OUT_UPDATE_LAST_OPC,
 		.tos_hs		= tgt_out_handlers
 	},
 	{
@@ -2124,6 +2128,9 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
 	m->ofd_tot_granted = 0;
 	m->ofd_tot_pending = 0;
 	m->ofd_seq_count = 0;
+	init_waitqueue_head(&m->ofd_inconsistency_thread.t_ctl_waitq);
+	INIT_LIST_HEAD(&m->ofd_inconsistency_list);
+	spin_lock_init(&m->ofd_inconsistency_lock);
 
 	spin_lock_init(&m->ofd_batch_lock);
 	rwlock_init(&obd->u.filter.fo_sptlrpc_lock);
@@ -2228,7 +2235,14 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
 	if (rc)
 		GOTO(err_fini_lut, rc);
 
+	rc = ofd_start_inconsistency_verification_thread(m);
+	if (rc != 0)
+		GOTO(err_fini_fs, rc);
+
 	RETURN(0);
+
+err_fini_fs:
+	ofd_fs_cleanup(env, m);
 err_fini_lut:
 	tgt_fini(env, &m->ofd_lut);
 err_free_ns:
@@ -2250,12 +2264,13 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
 	stop.ls_status = LS_PAUSED;
 	stop.ls_flags = 0;
 	lfsck_stop(env, m->ofd_osd, &stop);
-	lfsck_degister(env, m->ofd_osd);
 	target_recovery_fini(obd);
 	obd_exports_barrier(obd);
 	obd_zombie_barrier();
 
 	tgt_fini(env, &m->ofd_lut);
+	ofd_stop_inconsistency_verification_thread(m);
+	lfsck_degister(env, m->ofd_osd);
 	ofd_fs_cleanup(env, m);
 
 	ofd_free_capa_keys(m);