Commit c2c8a901 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

rhashtable-test: Get rid of ptr in test_obj structure 



This only blows up the size of the test structure for no gain
in test coverage. Reduces size of test_obj from 24 to 16 bytes.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1aa661f5

lib/test_rhashtable.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>









#define TEST_PTR	((void *) 0xdeadbeef)

#define MAX_ENTRIES	1000000

#define MAX_ENTRIES	1000000





static int entries = 50000;

static int entries = 50000;
@@ -46,7 +45,6 @@ module_param(size, int, 0); 
MODULE_PARM_DESC(size, "Initial size hint of table (default: 8)");

MODULE_PARM_DESC(size, "Initial size hint of table (default: 8)");





struct test_obj {

struct test_obj {

	void			*ptr;

	int			value;

	int			value;

	struct rhash_head	node;

	struct rhash_head	node;

};

};
@@ -78,9 +76,9 @@ static int __init test_rht_lookup(struct rhashtable *ht) 
				key);

				key);

			return -EEXIST;

			return -EEXIST;

		} else if (expected && obj) {

		} else if (expected && obj) {

			if (obj->ptr != TEST_PTR || obj->value != i) {

			if (obj->value != i) {

				pr_warn("Test failed: Lookup value mismatch %p!=%p, %u!=%u\n",

				pr_warn("Test failed: Lookup value mismatch %u!=%u\n",

					obj->ptr, TEST_PTR, obj->value, i);

					obj->value, i);

				return -EINVAL;

				return -EINVAL;

			}

			}

		}

		}
@@ -153,7 +151,6 @@ static s64 __init test_rhashtable(struct rhashtable *ht) 
			goto error;

			goto error;

		}

		}





		obj->ptr = TEST_PTR;

		obj->value = i * 2;

		obj->value = i * 2;





		err = rhashtable_insert_fast(ht, &obj->node, test_rht_params);

		err = rhashtable_insert_fast(ht, &obj->node, test_rht_params);