s390/appldata_net_sum: do not use static data (2ab14619) · Commits · 戴 / test

arch/s390/appldata/appldata_net_sum.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		* book:
		* http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml
		*/
		static struct appldata_net_sum_data {
		struct appldata_net_sum_data {
		u64 timestamp;
		u32 sync_count_1; /* after VM collected the record data, */
		u32 sync_count_2; /* sync_count_1 and sync_count_2 should be the
		@@ -51,7 +51,7 @@ static struct appldata_net_sum_data {
		u64 rx_dropped; /* no space in linux buffers */
		u64 tx_dropped; /* no space available in linux */
		u64 collisions; /* collisions while transmitting */
		} __attribute__((packed)) appldata_net_sum_data;
		} __packed;


		/*
		@@ -121,7 +121,6 @@ static struct appldata_ops ops = {
		.record_nr = APPLDATA_RECORD_NET_SUM_ID,
		.size = sizeof(struct appldata_net_sum_data),
		.callback = &appldata_get_net_sum_data,
		.data = &appldata_net_sum_data,
		.owner = THIS_MODULE,
		.mod_lvl = {0xF0, 0xF0}, /* EBCDIC "00" */
		};
		@@ -134,7 +133,17 @@ static struct appldata_ops ops = {
		*/
		static int __init appldata_net_init(void)
		{
		return appldata_register_ops(&ops);
		int ret;

		ops.data = kzalloc(sizeof(struct appldata_net_sum_data), GFP_KERNEL);
		if (!ops.data)
		return -ENOMEM;

		ret = appldata_register_ops(&ops);
		if (ret)
		kfree(ops.data);

		return ret;
		}

		/*
		@@ -145,6 +154,7 @@ static int __init appldata_net_init(void)
		static void __exit appldata_net_exit(void)
		{
		appldata_unregister_ops(&ops);
		kfree(ops.data);
		}