X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_handler.c;h=a2cc9644b84dac89d84e316f975020bb95e5375d;hp=40f4ca34b571bfff0e46ad436adf1707bbb30154;hb=4f53536d002c13886210b672b657795baa067144;hpb=f6995cf04407dff15d6ca79ca44cfa97dc6eb014

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 40f4ca3..a2cc964 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1000,12 +1000,10 @@ static int mdt_getattr_internal(struct mdt_thread_info *info,
         }
 
 	if (reqbody->mbo_valid & OBD_MD_FLMODEASIZE) {
-		repbody->mbo_max_cookiesize = 0;
 		repbody->mbo_max_mdsize = info->mti_mdt->mdt_max_mdsize;
 		repbody->mbo_valid |= OBD_MD_FLMODEASIZE;
-		CDEBUG(D_INODE, "I am going to change the MAX_MD_SIZE & "
-		       "MAX_COOKIE to : %d:%d\n", repbody->mbo_max_mdsize,
-		       repbody->mbo_max_cookiesize);
+		CDEBUG(D_INODE, "changing the max MD size to %u\n",
+		       repbody->mbo_max_mdsize);
 	}
 
 	if (exp_connect_rmtclient(info->mti_exp) &&
@@ -1933,14 +1931,6 @@ static int mdt_quotactl(struct tgt_session_info *tsi)
 		RETURN(err_serious(rc));
 
 	switch (oqctl->qc_cmd) {
-	case Q_QUOTACHECK:
-	case LUSTRE_Q_INVALIDATE:
-	case LUSTRE_Q_FINVALIDATE:
-	case Q_QUOTAON:
-	case Q_QUOTAOFF:
-	case Q_INITQUOTA:
-		/* deprecated, not used any more */
-		RETURN(-EOPNOTSUPP);
 		/* master quotactl */
 	case Q_SETINFO:
 	case Q_SETQUOTA:
@@ -2324,8 +2314,6 @@ int mdt_remote_object_lock(struct mdt_thread_info *mti,
 
 	LASSERT(mdt_object_remote(o));
 
-	LASSERT(ibits == MDS_INODELOCK_UPDATE);
-
 	fid_build_reg_res_name(fid, res_id);
 
 	memset(einfo, 0, sizeof(*einfo));
@@ -3515,20 +3503,26 @@ static int mdt_register_lwp_callback(void *data)
 
 	LASSERT(mdt_seq_site(mdt)->ss_node_id != 0);
 
-	if (!likely(fld->lsf_new))
-		RETURN(0);
-
 	rc = lu_env_init(&env, LCT_MD_THREAD);
-	if (rc) {
+	if (rc < 0) {
 		CERROR("%s: cannot init env: rc = %d\n", mdt_obd_name(mdt), rc);
 		RETURN(rc);
 	}
 
-	rc = fld_update_from_controller(&env, fld);
-	if (rc != 0) {
-		CERROR("%s: cannot update controller: rc = %d\n",
-		       mdt_obd_name(mdt), rc);
+	/* Allocate new sequence now to avoid creating local transaction
+	 * in the normal transaction process */
+	rc = seq_server_check_and_alloc_super(&env,
+					      mdt_seq_site(mdt)->ss_server_seq);
+	if (rc < 0)
 		GOTO(out, rc);
+
+	if (fld->lsf_new) {
+		rc = fld_update_from_controller(&env, fld);
+		if (rc != 0) {
+			CERROR("%s: cannot update controller: rc = %d\n",
+			       mdt_obd_name(mdt), rc);
+			GOTO(out, rc);
+		}
 	}
 out:
 	lu_env_fini(&env);
@@ -4727,6 +4721,7 @@ static int mdt_prepare(const struct lu_env *env,
 	}
 
 	LASSERT(!test_bit(MDT_FL_CFGLOG, &mdt->mdt_state));
+
 	target_recovery_init(&mdt->mdt_lut, tgt_request_handle);
 	set_bit(MDT_FL_CFGLOG, &mdt->mdt_state);
 	LASSERT(obd->obd_no_conn);
@@ -5018,10 +5013,11 @@ static int mdt_obd_connect(const struct lu_env *env,
 	 *      at some point we should find a better one
 	 */
 	if (!test_bit(MDT_FL_SYNCED, &mdt->mdt_state) && data != NULL &&
-	    !(data->ocd_connect_flags & OBD_CONNECT_LIGHTWEIGHT)) {
+	    !(data->ocd_connect_flags & OBD_CONNECT_LIGHTWEIGHT) &&
+	    !(data->ocd_connect_flags & OBD_CONNECT_MDS_MDS)) {
 		rc = obd_get_info(env, mdt->mdt_child_exp,
 				  sizeof(KEY_OSP_CONNECTED),
-				  KEY_OSP_CONNECTED, NULL, NULL, NULL);
+				  KEY_OSP_CONNECTED, NULL, NULL);
 		if (rc)
 			RETURN(-EAGAIN);
 		set_bit(MDT_FL_SYNCED, &mdt->mdt_state);
@@ -5580,6 +5576,7 @@ static int mdt_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 break;
 	case OBD_IOC_ABORT_RECOVERY:
 		CERROR("%s: Aborting recovery for device\n", mdt_obd_name(mdt));
+		obd->obd_force_abort_recovery = 1;
 		target_stop_recovery_thread(obd);
 		rc = 0;
 		break;