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

Commit 7c6564d0 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: obd: remove unused LSM parameters 



Remove unused struct lov_stripe_md * parameters from obd_get_info(),
mgc_enqueue(), and osc_brw_prep_request().

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5814
Reviewed-on: http://review.whamcloud.com/13426


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarLai Siyao <lai.siyao@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.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 6ffa4ec9

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

+1 −2
Original line number Diff line number Diff line
@@ -845,8 +845,7 @@ struct obd_ops { 
	int (*iocontrol)(unsigned int cmd, struct obd_export *exp, int len,

			 void *karg, void __user *uarg);

	int (*get_info)(const struct lu_env *env, struct obd_export *,

			__u32 keylen, void *key, __u32 *vallen, void *val,

			struct lov_stripe_md *lsm);

			__u32 keylen, void *key, __u32 *vallen, void *val);

	int (*set_info_async)(const struct lu_env *, struct obd_export *,

			      __u32 keylen, void *key,

			      __u32 vallen, void *val,

drivers/staging/lustre/lustre/include/obd_class.h

+2 −4
Original line number Diff line number Diff line
@@ -415,16 +415,14 @@ static inline int class_devno_max(void) 


static inline int obd_get_info(const struct lu_env *env,

			       struct obd_export *exp, __u32 keylen,

			       void *key, __u32 *vallen, void *val,

			       struct lov_stripe_md *lsm)

			       void *key, __u32 *vallen, void *val)

{

	int rc;



	EXP_CHECK_DT_OP(exp, get_info);

	EXP_COUNTER_INCREMENT(exp, get_info);



	rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val,

					 lsm);

	rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val);

	return rc;

}

drivers/staging/lustre/lustre/llite/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		exp = count ? sbi->ll_md_exp : sbi->ll_dt_exp;

		vallen = sizeof(count);

		rc = obd_get_info(NULL, exp, sizeof(KEY_TGT_COUNT),

				  KEY_TGT_COUNT, &vallen, &count, NULL);

				  KEY_TGT_COUNT, &vallen, &count);

		if (rc) {

			CERROR("get target count failed: %d\n", rc);

			return rc;

drivers/staging/lustre/lustre/llite/lcommon_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp) 
	__u16 stripes, def_stripes;



	rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,

			  &valsize, &desc, NULL);

			  &valsize, &desc);

	if (rc)

		return rc;

drivers/staging/lustre/lustre/llite/llite_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 


	size = sizeof(*data);

	err = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_CONN_DATA),

			   KEY_CONN_DATA,  &size, data, NULL);

			   KEY_CONN_DATA,  &size, data);

	if (err) {

		CERROR("%s: Get connect data failed: rc = %d\n",

		       sbi->ll_md_exp->exp_obd->obd_name, err);
@@ -563,7 +563,7 @@ int ll_get_max_mdsize(struct ll_sb_info *sbi, int *lmmsize) 
	*lmmsize = obd_size_diskmd(sbi->ll_dt_exp, NULL);

	size = sizeof(int);

	rc = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_MAX_EASIZE),

			  KEY_MAX_EASIZE, &size, lmmsize, NULL);

			  KEY_MAX_EASIZE, &size, lmmsize);

	if (rc)

		CERROR("Get max mdsize error rc %d\n", rc);
@@ -587,7 +587,7 @@ int ll_get_default_mdsize(struct ll_sb_info *sbi, int *lmmsize) 


	size = sizeof(int);

	rc = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_DEFAULT_EASIZE),

			  KEY_DEFAULT_EASIZE, &size, lmmsize, NULL);

			  KEY_DEFAULT_EASIZE, &size, lmmsize);

	if (rc)

		CERROR("Get default mdsize error rc %d\n", rc);