From a152a5be2129656f47ddcc752575ec344089636a Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 5 Sep 2008 17:30:08 +0000
Subject: [PATCH] Branch b1_6 Fix file join to get right message buffer.
b=16658 i=tom.wang i=adilger (oleg.drokin original patch)
---
lustre/mds/mds_join.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lustre/mds/mds_join.c b/lustre/mds/mds_join.c
index 1fbaab84da..3064ecb3fb 100644
--- a/lustre/mds/mds_join.c
+++ b/lustre/mds/mds_join.c
@@ -230,8 +230,8 @@ exit:
static void mds_finish_join(struct mds_obd *mds, struct ptlrpc_request *req,
struct inode *inode, struct lov_mds_md_join *lmmj)
{
- struct mds_body *body = (struct mds_body *)
- lustre_msg_buf(req->rq_repmsg, 1, 0);
+ struct mds_body *body = lustre_msg_buf(req->rq_repmsg,DLM_REPLY_REC_OFF,
+ sizeof(*body));
int max_cookiesize = lmmj->lmmj_md.lmm_stripe_count *
sizeof(struct llog_cookie);
int max_easize = sizeof(*lmmj);
@@ -239,7 +239,7 @@ static void mds_finish_join(struct mds_obd *mds, struct ptlrpc_request *req,
CDEBUG(D_INFO, "change the max md size from %d to "LPSZ"\n",
mds->mds_max_mdsize, sizeof(*lmmj));
- if (mds->mds_max_mdsize < max_easize ||
+ if (mds->mds_max_mdsize < max_easize ||
mds->mds_max_cookiesize < max_cookiesize) {
body->max_mdsize = mds->mds_max_mdsize > max_easize ?
mds->mds_max_mdsize : max_easize;
--
GitLab