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

staging/lustre: remove obd_memory stats counter 



Now that we no longer track allocated memory, remove
obd_memory statistics counter and all references to it everywhere

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ea9d665

drivers/staging/lustre/lustre/include/obd_support.h

+0 −7
Original line number Diff line number Diff line
@@ -43,13 +43,6 @@ 
#include "lprocfs_status.h"



/* global variables */

extern struct lprocfs_stats *obd_memory;

enum {

	OBD_MEMORY_STAT = 0,

	OBD_MEMORY_PAGES_STAT = 1,

	OBD_STATS_NUM,

};



extern unsigned int obd_debug_peer_on_timeout;

extern unsigned int obd_dump_on_timeout;

extern unsigned int obd_dump_on_eviction;

drivers/staging/lustre/lustre/obdclass/class_obd.c

+0 −18
Original line number Diff line number Diff line
@@ -487,22 +487,6 @@ static int __init init_obdclass(void) 
	spin_lock_init(&obd_types_lock);

	obd_zombie_impexp_init();



	obd_memory = lprocfs_alloc_stats(OBD_STATS_NUM,

					 LPROCFS_STATS_FLAG_NONE |

					 LPROCFS_STATS_FLAG_IRQ_SAFE);



	if (obd_memory == NULL) {

		CERROR("kmalloc of 'obd_memory' failed\n");

		return -ENOMEM;

	}



	lprocfs_counter_init(obd_memory, OBD_MEMORY_STAT,

			     LPROCFS_CNTR_AVGMINMAX,

			     "memused", "bytes");

	lprocfs_counter_init(obd_memory, OBD_MEMORY_PAGES_STAT,

			     LPROCFS_CNTR_AVGMINMAX,

			     "pagesused", "pages");



	err = obd_init_checks();

	if (err == -EOVERFLOW)

		return err;
@@ -592,8 +576,6 @@ static void cleanup_obdclass(void) 
	class_handle_cleanup();

	class_exit_uuidlist();

	obd_zombie_impexp_stop();



	lprocfs_free_stats(&obd_memory);

}



MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");

drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c

+0 −9
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
#include "../include/lprocfs_status.h"

#include "../include/obd_support.h"



struct lprocfs_stats *obd_memory;

EXPORT_SYMBOL(obd_memory);



void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount)

{

	struct lprocfs_counter		*percpu_cntr;
@@ -74,9 +71,6 @@ void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount) 
		 * ldlm_pool_shrink(), which calls lprocfs_counter_add().

		 * LU-1727.

		 *

		 * Only obd_memory uses LPROCFS_STATS_FLAG_IRQ_SAFE

		 * flag, because it needs accurate counting lest memory leak

		 * check reports error.

		 */

		if (in_interrupt() &&

		    (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0)
@@ -124,9 +118,6 @@ void lprocfs_counter_sub(struct lprocfs_stats *stats, int idx, long amount) 
		 * softirq context here, use separate counter for that.

		 * bz20650.

		 *

		 * Only obd_memory uses LPROCFS_STATS_FLAG_IRQ_SAFE

		 * flag, because it needs accurate counting lest memory leak

		 * check reports error.

		 */

		if (in_interrupt() &&

		    (stats->ls_flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0)

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

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ struct lprocfs_stats *lprocfs_alloc_stats(unsigned int num, 
			goto fail;

		stats->ls_biggest_alloc_num = 1;

	} else if ((flags & LPROCFS_STATS_FLAG_IRQ_SAFE) != 0) {

		/* alloc all percpu data, currently only obd_memory use this */

		/* alloc all percpu data */

		for (i = 0; i < num_entry; ++i)

			if (lprocfs_stats_alloc_one(stats, i) < 0)

				goto fail;