From: tappro <tappro>
Date: Sun, 10 Sep 2006 21:33:30 +0000 (+0000)
Subject: add defects inspired by removing local fld connection.
X-Git-Tag: v1_8_0_110~486^2~965
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2a135cdb6bfd23a0eed07bb03abdded15bf3c69b;p=fs%2Flustre-release.git

add defects inspired by removing local fld connection.
- cmm_tgt_count is 1 less than total MDS number
- fld_server_lookup() stores mds number in wrong variable because it is
  rewritten later.
---

diff --git a/lustre/cmm/cmm_object.c b/lustre/cmm/cmm_object.c
index bdaa115..455bb27 100644
--- a/lustre/cmm/cmm_object.c
+++ b/lustre/cmm/cmm_object.c
@@ -56,7 +56,7 @@ static int cmm_fld_lookup(struct cmm_device *cm,
                 RETURN(rc);
         }
 
-        if (*mds >= cm->cmm_tgt_count) {
+        if (*mds > cm->cmm_tgt_count) {
                 CERROR("Got invalid mdsno: "LPU64" (max: %u)\n",
                        *mds, cm->cmm_tgt_count);
                 rc = -EINVAL;
diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 39c0dc6..b5a9bd9 100644
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -496,7 +496,7 @@ int fld_client_lookup(struct lu_client_fld *fld,
         if (target->ft_srv != NULL) {
                 LASSERT(ctx != NULL);
                 rc = fld_server_lookup(target->ft_srv,
-                                       ctx, seq, mds);
+                                       ctx, seq, &md_fld.mf_mds);
         } else {
 #endif
                 rc = fld_client_rpc(target->ft_exp,