Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6718d1d authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

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: default avatarwang 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: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c08db984

drivers/staging/lustre/lustre/include/obd.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/lustre/lustre/mdc/mdc_request.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

			}