X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=8e19bc403ae79f1ff94ee7e0fafe04af8598e42a;hb=6811bf3ef3f157e82c189f22e0b5cedd8a8ba1db;hp=40b0a24f38bea36b2379836ee447f0e2923e726d;hpb=53ef87d70bcddd1678edaeeeb5f4e0b0cb55c843;p=osl.git

diff --git a/osl.c b/osl.c
index 40b0a24..8e19bc4 100644
--- a/osl.c
+++ b/osl.c
@@ -168,7 +168,7 @@ static char *disk_storage_name_of_object(const struct osl_table *t,
 	const struct osl_object *obj)
 {
 	HASH_TYPE hash[HASH_SIZE];
-	hash_object(obj, hash);
+	hash_object(t, obj, hash);
 	return disk_storage_name_of_hash(t, hash);
 }
 
@@ -186,9 +186,10 @@ static int disk_storage_name_of_row(const struct osl_table *t,
 	return -E_OSL_NOMEM;
 }
 
-static void column_name_hash(const char *col_name, HASH_TYPE *hash)
+static void column_name_hash(const struct osl_table *t, const char *col_name,
+		HASH_TYPE *hash)
 {
-	hash_function(col_name, strlen(col_name), hash);
+	hash_function(t->version, col_name, strlen(col_name), hash);
 }
 
 static int init_column_descriptions(struct osl_table *t)
@@ -553,7 +554,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 			if (ret < 0)
 				goto out;
 		}
-		column_name_hash(cd->name, t->columns[i].name_hash);
+		column_name_hash(t, cd->name, t->columns[i].name_hash);
 		ret = -E_OSL_NOMEM;
 		filename = column_filename(t, i);
 		if (!filename)
@@ -724,7 +725,7 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 	FOR_EACH_COLUMN(i, t->desc, cd) {
 		if (cd->storage_type == OSL_NO_STORAGE)
 			continue;
-		column_name_hash(cd->name, t->columns[i].name_hash);
+		column_name_hash(t, cd->name, t->columns[i].name_hash);
 		if (num_rows > 0 && cd->storage_type == OSL_MAPPED_STORAGE) {
 			ret = map_column(t, i);
 			if (ret < 0)