X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_lvb.c;h=9a830d0fb37cec9f69b7bada5cdaac5771857054;hb=20dfdeda5ea3f679b68c4a9fb6924c90a0a79cac;hp=91df890ed84ee589d05d4adccfd98c353e31aa3f;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_lvb.c b/lustre/mdt/mdt_lvb.c
index 91df890..9a830d0 100644
--- a/lustre/mdt/mdt_lvb.c
+++ b/lustre/mdt/mdt_lvb.c
@@ -72,10 +72,13 @@ static int mdt_lvbo_update(struct ldlm_resource *res,
 
 static int mdt_lvbo_size(struct ldlm_lock *lock)
 {
-	if (IS_LQUOTA_RES(lock->l_resource)) {
-		struct mdt_device	*mdt;
+	struct mdt_device *mdt;
+
+	/* resource on server side never changes. */
+	mdt = ldlm_res_to_ns(lock->l_resource)->ns_lvbp;
+	LASSERT(mdt != NULL);
 
-		mdt = ldlm_res_to_ns(lock->l_resource)->ns_lvbp;
+	if (IS_LQUOTA_RES(lock->l_resource)) {
 		if (mdt->mdt_qmt_dev == NULL)
 			return 0;
 
@@ -83,24 +86,93 @@ static int mdt_lvbo_size(struct ldlm_lock *lock)
 		return qmt_hdls.qmth_lvbo_size(mdt->mdt_qmt_dev, lock);
 	}
 
+	if (ldlm_has_layout(lock))
+		return mdt->mdt_max_mdsize;
+
 	return 0;
 }
 
 static int mdt_lvbo_fill(struct ldlm_lock *lock, void *lvb, int lvblen)
 {
+	struct lu_env env;
+	struct mdt_thread_info *info;
+	struct mdt_device *mdt;
+	struct lu_fid *fid;
+	struct mdt_object *obj = NULL;
+	struct md_object *child = NULL;
+	int rc;
+	ENTRY;
+
+	mdt = ldlm_lock_to_ns(lock)->ns_lvbp;
 	if (IS_LQUOTA_RES(lock->l_resource)) {
-		struct mdt_device	*mdt;
-
-		mdt = ldlm_res_to_ns(lock->l_resource)->ns_lvbp;
 		if (mdt->mdt_qmt_dev == NULL)
-			return 0;
+			RETURN(0);
 
 		/* call lvbo fill function of quota master */
-		return qmt_hdls.qmth_lvbo_fill(mdt->mdt_qmt_dev, lock, lvb,
-					       lvblen);
+		rc = qmt_hdls.qmth_lvbo_fill(mdt->mdt_qmt_dev, lock, lvb,
+					     lvblen);
+		RETURN(rc);
 	}
 
-	return 0;
+	if (lock->l_resource->lr_type != LDLM_IBITS ||
+		!(lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_LAYOUT))
+		RETURN(0);
+
+	/* layout lock will be granted to client, fill in lvb with layout */
+
+	/* XXX create an env to talk to mdt stack. We should get this env from
+	 * ptlrpc_thread->t_env. */
+	rc = lu_env_init(&env, LCT_MD_THREAD);
+	LASSERT(rc == 0);
+
+	info = lu_context_key_get(&env.le_ctx, &mdt_thread_key);
+	LASSERT(info != NULL);
+	memset(info, 0, sizeof *info);
+	info->mti_env = &env;
+	info->mti_exp = lock->l_export;
+	info->mti_mdt = mdt;
+
+	/* XXX get fid by resource id. why don't include fid in ldlm_resource */
+	fid = &info->mti_tmp_fid2;
+	fid_build_from_res_name(fid, &lock->l_resource->lr_name);
+
+	obj = mdt_object_find(&env, info->mti_mdt, fid);
+	if (IS_ERR(obj))
+		GOTO(out, rc = PTR_ERR(obj));
+
+	if (!mdt_object_exists(obj) || mdt_object_remote(obj))
+		GOTO(out, rc = -ENOENT);
+
+	child = mdt_object_child(obj);
+
+	/* get the length of lsm */
+	rc = mo_xattr_get(&env, child, &LU_BUF_NULL, XATTR_NAME_LOV);
+	if (rc < 0)
+		GOTO(out, rc);
+
+	if (rc > 0) {
+		struct lu_buf *lmm = NULL;
+
+		if (lvblen < rc) {
+			CERROR("%s: expected %d actual %d.\n",
+				info->mti_exp->exp_obd->obd_name, rc, lvblen);
+			GOTO(out, rc = -ERANGE);
+		}
+
+		lmm = &info->mti_buf;
+		lmm->lb_buf = lvb;
+		lmm->lb_len = rc;
+
+		rc = mo_xattr_get(&env, child, lmm, XATTR_NAME_LOV);
+		if (rc < 0)
+			GOTO(out, rc);
+	}
+
+out:
+	if (obj != NULL && !IS_ERR(obj))
+		mdt_object_put(&env, obj);
+	lu_env_fini(&env);
+	RETURN(rc < 0 ? 0 : rc);
 }
 
 static int mdt_lvbo_free(struct ldlm_resource *res)