staging: lustre: obd: rename struct lmv_stripe_md field mea to lmv

Rename struct lmv_stripe_md in struct lustre_md from mea
to lmv.

Signed-off-by: wang di <di.wang@intel.com>
Reviewed-on: http://review.whamcloud.com/7043
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3531
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index e6fca9025cfabb31ace2d3a0044278f55859b9ac..1575c822ffa6ef998f09172ded5262a05710f578 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -1031,7 +1031,7 @@ enum {
 struct lustre_md {
        struct mdt_body  *body;
        struct lov_stripe_md    *lsm;
-       struct lmv_stripe_md    *mea;
+       struct lmv_stripe_md    *lmv;
 #ifdef CONFIG_FS_POSIX_ACL
        struct posix_acl        *posix_acl;
 #endif

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 0e1588a43187ac8207f1d7fd3b8ab53e15158ab7..fac04f05b27bc8f58514a0d548ae034a18457b2d 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -2571,8 +2571,8 @@ static int lmv_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
        struct lmv_obd    *lmv = &obd->u.lmv;
        struct lmv_tgt_desc *tgt = lmv->tgts[0];
 
-       if (md->mea)
-               obd_free_memmd(exp, (void *)&md->mea);
+       if (md->lmv)
+               obd_free_memmd(exp, (void *)&md->lmv);
        if (!tgt || !tgt->ltd_exp)
                return -EINVAL;
        return md_free_lustre_md(tgt->ltd_exp, md);

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 542801f04b0d8d61637394897c2c855d3c636411..55859a0f013c64b224c660ec5b452f1c01aea3ca 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -504,15 +504,15 @@ static int mdc_get_lustre_md(struct obd_export *exp,
                                goto out;
                        }
 
-                       rc = obd_unpackmd(md_exp, (void *)&md->mea, lmv,
+                       rc = obd_unpackmd(md_exp, (void *)&md->lmv, lmv,
                                          lmvsize);
                        if (rc < 0)
                                goto out;
 
-                       if (rc < sizeof(*md->mea)) {
+                       if (rc < sizeof(*md->lmv)) {
                                CDEBUG(D_INFO,
-                                      "size too small: rc < sizeof(*md->mea) (%d < %d)\n",
-                                       rc, (int)sizeof(*md->mea));
+                                      "size too small: rc < sizeof(*md->lmv) (%d < %d)\n",
+                                       rc, (int)sizeof(*md->lmv));
                                rc = -EPROTO;
                                goto out;
                        }