patch-1.3.28 linux/fs/dcache.c

• Lines: 47
• Date: Mon Sep 18 08:54:10 1995
• Orig file: v1.3.27/linux/fs/dcache.c
• Orig date: Wed Aug 2 13:21:15 1995

diff -u --recursive --new-file v1.3.27/linux/fs/dcache.c linux/fs/dcache.c
@@ -41,7 +41,7 @@
  */
 struct dir_cache_entry {
 	struct hash_list h;
-	unsigned long dev;
+	kdev_t dc_dev;
 	unsigned long dir;
 	unsigned long version;
 	unsigned long ino;
@@ -52,8 +52,8 @@
 };
 
 #define COPYDATA(de, newde) \
-memcpy((void *) &newde->dev, (void *) &de->dev, \
-4*sizeof(unsigned long) + 1 + DCACHE_NAME_LEN)
+memcpy((void *) &newde->dc_dev, (void *) &de->dc_dev, \
+sizeof(kdev_t) + 3*sizeof(unsigned long) + 1 + DCACHE_NAME_LEN)
 
 static struct dir_cache_entry level1_cache[DCACHE_SIZE];
 static struct dir_cache_entry level2_cache[DCACHE_SIZE];
@@ -70,7 +70,7 @@
  * itself on the doubly-linked list, not just a pointer to the first entry.
  */
 #define DCACHE_HASH_QUEUES 19
-#define hash_fn(dev,dir,namehash) (((dev) ^ (dir) ^ (namehash)) % DCACHE_HASH_QUEUES)
+#define hash_fn(dev,dir,namehash) ((HASHDEV(dev) ^ (dir) ^ (namehash)) % DCACHE_HASH_QUEUES)
 
 static struct hash_list hash_table[DCACHE_HASH_QUEUES];
 
@@ -135,7 +135,7 @@
 	struct dir_cache_entry * de = hash->next;
 
 	for (de = hash->next ; de != (struct dir_cache_entry *) hash ; de = de->h.next) {
-		if (de->dev != dir->i_dev)
+		if (de->dc_dev != dir->i_dev)
 			continue;
 		if (de->dir != dir->i_ino)
 			continue;
@@ -201,7 +201,7 @@
 	de = level1_head;
 	level1_head = de->next_lru;
 	remove_hash(de);
-	de->dev = dir->i_dev;
+	de->dc_dev = dir->i_dev;
 	de->dir = dir->i_ino;
 	de->version = dir->i_version;
 	de->ino = ino;