Commit 9a6198c7 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/obdclass: Remove unused lprocfs_alloc/free_obd_stats 



obd_stats in the form present were only used on the server,
so let's remove them from the client code
This also removes lprocfs_init_ops_stats helper.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9184bd51

drivers/staging/lustre/lustre/include/lprocfs_status.h

+0 −4
Original line number Diff line number Diff line
@@ -539,16 +539,12 @@ extern struct lprocfs_stats * 
lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags);

void lprocfs_clear_stats(struct lprocfs_stats *stats);

void lprocfs_free_stats(struct lprocfs_stats **stats);

void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats);

void lprocfs_init_mps_stats(int num_private_stats, struct lprocfs_stats *stats);

void lprocfs_init_ldlm_stats(struct lprocfs_stats *ldlm_stats);

int lprocfs_alloc_obd_stats(struct obd_device *obddev,

			    unsigned int num_private_stats);

int lprocfs_alloc_md_stats(struct obd_device *obddev,

			   unsigned int num_private_stats);

void lprocfs_counter_init(struct lprocfs_stats *stats, int index,

			  unsigned conf, const char *name, const char *units);

void lprocfs_free_obd_stats(struct obd_device *obddev);

void lprocfs_free_md_stats(struct obd_device *obddev);

struct obd_export;

int lprocfs_exp_cleanup(struct obd_export *exp);

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

+0 −105
Original line number Diff line number Diff line
@@ -1300,111 +1300,6 @@ void lprocfs_counter_init(struct lprocfs_stats *stats, int index, 
}

EXPORT_SYMBOL(lprocfs_counter_init);



#define LPROCFS_OBD_OP_INIT(base, stats, op)			       \

do {								       \

	unsigned int coffset = base + OBD_COUNTER_OFFSET(op);	      \

	LASSERT(coffset < stats->ls_num);				  \

	lprocfs_counter_init(stats, coffset, 0, #op, "reqs");	      \

} while (0)



void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)

{

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, iocontrol);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_info);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, set_info_async);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, attach);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, detach);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setup);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, precleanup);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, cleanup);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, process_config);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, postrecov);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, add_conn);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, del_conn);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, connect);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, reconnect);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, disconnect);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_init);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_fini);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_alloc);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, preallocate);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, create);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr_async);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr_async);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, adjust_kms);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, find_cbdata);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_uuid);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotacheck);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotactl);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_new);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_rem);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_add);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_del);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getref);

	LPROCFS_OBD_OP_INIT(num_private_stats, stats, putref);

}

EXPORT_SYMBOL(lprocfs_init_ops_stats);



int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats)

{

	struct lprocfs_stats *stats;

	unsigned int num_stats;

	int rc, i;



	LASSERT(obd->obd_stats == NULL);

	LASSERT(obd->obd_debugfs_entry != NULL);

	LASSERT(obd->obd_cntr_base == 0);



	num_stats = ((int)sizeof(*obd->obd_type->typ_dt_ops) / sizeof(void *)) +

		num_private_stats - 1 /* o_owner */;

	stats = lprocfs_alloc_stats(num_stats, 0);

	if (stats == NULL)

		return -ENOMEM;



	lprocfs_init_ops_stats(num_private_stats, stats);



	for (i = num_private_stats; i < num_stats; i++) {

		/* If this LBUGs, it is likely that an obd

		 * operation was added to struct obd_ops in

		 * <obd.h>, and that the corresponding line item

		 * LPROCFS_OBD_OP_INIT(.., .., opname)

		 * is missing from the list above. */

		LASSERTF(stats->ls_cnt_header[i].lc_name != NULL,

			 "Missing obd_stat initializer obd_op operation at offset %d.\n",

			 i - num_private_stats);

	}

	rc = ldebugfs_register_stats(obd->obd_debugfs_entry, "stats", stats);

	if (rc < 0) {

		lprocfs_free_stats(&stats);

	} else {

		obd->obd_stats  = stats;

		obd->obd_cntr_base = num_private_stats;

	}

	return rc;

}

EXPORT_SYMBOL(lprocfs_alloc_obd_stats);



void lprocfs_free_obd_stats(struct obd_device *obd)

{

	if (obd->obd_stats)

		lprocfs_free_stats(&obd->obd_stats);

}

EXPORT_SYMBOL(lprocfs_free_obd_stats);



#define LPROCFS_MD_OP_INIT(base, stats, op)			     \

do {								    \

	unsigned int coffset = base + MD_COUNTER_OFFSET(op);	    \

CRA Git | Maintained and supported by SUSTech CRA and CCSE