X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_handler.c;h=4caa22a4b90301da10f2e2694aea3ff95490d2a6;hp=5bf33062c6bceb6639387f0af882dea620afc965;hb=4d7b022e373d265f4f3b9d90af44cddd0e65f9ae;hpb=e70a6fd8a6400c0460a6c66668103c23b7997d30

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 5bf3306..4caa22a 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1527,12 +1527,12 @@ static int mdt_swap_layouts(struct tgt_session_info *tsi)
 	/* permission check. Make sure the calling process having permission
 	 * to write both files. */
 	rc = mo_permission(info->mti_env, NULL, mdt_object_child(o1), NULL,
-				MAY_WRITE);
+			   MAY_WRITE);
 	if (rc < 0)
 		GOTO(put, rc);
 
 	rc = mo_permission(info->mti_env, NULL, mdt_object_child(o2), NULL,
-				MAY_WRITE);
+			   MAY_WRITE);
 	if (rc < 0)
 		GOTO(put, rc);
 
@@ -2169,7 +2169,7 @@ out_shrink:
 	 * Data-on-MDT optimization - read data along with OPEN and return it
 	 * in reply. Do that only if we have both DOM and LAYOUT locks.
 	 */
-	if (rc == 0 && op == REINT_OPEN &&
+	if (rc == 0 && op == REINT_OPEN && !req_is_replay(pill->rc_req) &&
 	    info->mti_attr.ma_lmm != NULL &&
 	    mdt_lmm_dom_entry(info->mti_attr.ma_lmm) == LMM_DOM_ONLY) {
 		rc = mdt_dom_read_on_open(info, info->mti_mdt,
@@ -2658,6 +2658,7 @@ int mdt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 {
 	struct obd_device *obd = ldlm_lock_to_ns(lock)->ns_obd;
 	struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+	struct ldlm_cb_set_arg *arg = data;
 	bool commit_async = false;
 	int rc;
 	ENTRY;
@@ -2670,17 +2671,22 @@ int mdt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 		unlock_res_and_lock(lock);
 		RETURN(0);
 	}
-	/* There is no lock conflict if l_blocking_lock == NULL,
-	 * it indicates a blocking ast sent from ldlm_lock_decref_internal
-	 * when the last reference to a local lock was released */
-	if (lock->l_req_mode & (LCK_PW | LCK_EX) &&
-	    lock->l_blocking_lock != NULL) {
+
+	/* A blocking ast may be sent from ldlm_lock_decref_internal
+	 * when the last reference to a local lock was released and
+	 * during blocking event from ldlm_work_bl_ast_lock().
+	 * The 'data' parameter is l_ast_data in the first case and
+	 * callback arguments in the second one. Distinguish them by that.
+	 */
+	if (!data || data == lock->l_ast_data || !arg->bl_desc)
+		goto skip_cos_checks;
+
+	if (lock->l_req_mode & (LCK_PW | LCK_EX)) {
 		if (mdt_cos_is_enabled(mdt)) {
-			if (lock->l_client_cookie !=
-			    lock->l_blocking_lock->l_client_cookie)
+			if (!arg->bl_desc->bl_same_client)
 				mdt_set_lock_sync(lock);
 		} else if (mdt_slc_is_enabled(mdt) &&
-			   ldlm_is_cos_incompat(lock->l_blocking_lock)) {
+			   arg->bl_desc->bl_cos_incompat) {
 			mdt_set_lock_sync(lock);
 			/*
 			 * we may do extra commit here, but there is a small
@@ -2694,11 +2700,11 @@ int mdt_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 			 */
 			commit_async = true;
 		}
-	} else if (lock->l_req_mode == LCK_COS &&
-		   lock->l_blocking_lock != NULL) {
+	} else if (lock->l_req_mode == LCK_COS) {
 		commit_async = true;
 	}
 
+skip_cos_checks:
 	rc = ldlm_blocking_ast_nocheck(lock);
 
 	if (commit_async) {
@@ -3051,6 +3057,10 @@ mdt_object_lock_internal(struct mdt_thread_info *info, struct mdt_object *o,
 		}
 	}
 
+	/* other components like LFSCK can use lockless access
+	 * and populate cache, so we better invalidate it */
+	mo_invalidate(info->mti_env, mdt_object_child(o));
+
 	RETURN(0);
 }
 
@@ -3793,6 +3803,8 @@ static int mdt_intent_layout(enum ldlm_intent_flags it_opc,
 			if (layout_size > info->mti_mdt->mdt_max_mdsize)
 				info->mti_mdt->mdt_max_mdsize = layout_size;
 		}
+		CDEBUG(D_INFO, "%s: layout_size %d\n",
+		       mdt_obd_name(info->mti_mdt), layout_size);
 	}
 
 	/*
@@ -3864,7 +3876,7 @@ out_obj:
 out:
 	lhc->mlh_reg_lh.cookie = 0;
 
-	return rc;
+	RETURN(rc);
 }
 
 static int mdt_intent_open(enum ldlm_intent_flags it_opc,
@@ -5032,7 +5044,7 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
 	obd = class_name2obd(dev);
 	LASSERT(obd != NULL);
 
-	m->mdt_max_mdsize = MAX_MD_SIZE; /* 4 stripes */
+	m->mdt_max_mdsize = MAX_MD_SIZE_OLD;
 	m->mdt_opts.mo_evict_tgt_nids = 1;
 	m->mdt_opts.mo_cos = MDT_COS_DEFAULT;
 
@@ -5061,7 +5073,9 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
 	INIT_LIST_HEAD(&m->mdt_squash.rsi_nosquash_nids);
 	init_rwsem(&m->mdt_squash.rsi_sem);
 	spin_lock_init(&m->mdt_lock);
-	m->mdt_enable_remote_dir = 0;
+	m->mdt_enable_remote_dir = 1;
+	m->mdt_enable_striped_dir = 1;
+	m->mdt_enable_dir_migration = 1;
 	m->mdt_enable_remote_dir_gid = 0;
 
 	atomic_set(&m->mdt_mds_mds_conns, 0);
@@ -5751,7 +5765,7 @@ static int mdt_export_cleanup(struct obd_export *exp)
 			 * archive request into a noop if it's not actually
 			 * dirty.
 			 */
-			if (mfd->mfd_mode & MDS_FMODE_WRITE)
+			if (mfd->mfd_open_flags & MDS_FMODE_WRITE)
 				rc = mdt_ctxt_add_dirty_flag(&env, info, mfd);
 
 			/* Don't unlink orphan on failover umount, LU-184 */