Replace references to the NUMBER field in a node's disknode structures with

  references to the CACHE_ID field in the node.

4 files changed, 15 insertions, 15 deletions

diff --git a/ext2fs/getblk.c b/ext2fs/getblk.c
index 0d06065b..ecc69dcc 100644
--- a/ext2fs/getblk.c
+++ b/ext2fs/getblk.c
@@ -1,6 +1,6 @@
 /* File block to disk block mapping routines
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
    Converted to work under the hurd by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -53,7 +53,7 @@ ext2_discard_prealloc (struct node *node)
     {
       int i = node->dn->info.i_prealloc_count;
       ext2_debug ("discarding %d prealloced blocks for inode %d",
-		  i, node->dn->number);
+		  i, node->cache_id);
       node->dn->info.i_prealloc_count = 0;
       ext2_free_blocks (node->dn->info.i_prealloc_block, i);
     }
diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c
index cefc6850..f2d9348e 100644
--- a/ext2fs/ialloc.c
+++ b/ext2fs/ialloc.c
@@ -1,6 +1,6 @@
 /* Inode allocation routines.
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
    Converted to work under the hurd by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -55,7 +55,7 @@ diskfs_free_node (struct node *np, mode_t old_mode)
   unsigned long block_group;
   unsigned long bit;
   struct ext2_group_desc *gdp;
-  ino_t inum = np->dn->number;
+  ino_t inum = np->cache_id;
 
   assert (!diskfs_readonly);
 
@@ -277,12 +277,12 @@ diskfs_alloc_node (struct node *dir, mode_t mode, struct node **node)
 
   assert (!diskfs_readonly);
 
-  inum = ext2_alloc_inode (dir->dn->number, mode);
+  inum = ext2_alloc_inode (dir->cache_id, mode);
 
   if (inum == 0)
     return ENOSPC;
 
-  err = iget (inum, &np);
+  err = diskfs_cached_lookup (inum, &np);
   if (err)
     return err;
 
diff --git a/ext2fs/pager.c b/ext2fs/pager.c
index 351535c3..4d31cf12 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
@@ -273,7 +273,7 @@ file_pager_write_page (struct node *node, vm_offset_t offset, vm_address_t buf)
   else if (offset + left > node->allocsize)
     left = node->allocsize - offset;
 
-  ext2_debug ("writing inode %d page %d[%d]", node->dn->number, offset, left);
+  ext2_debug ("writing inode %d page %d[%d]", node->cache_id, offset, left);
 
   while (left > 0)
     {
@@ -450,10 +450,10 @@ pager_unlock_page (struct user_pager_info *pager, vm_offset_t page)
 #ifdef EXT2FS_DEBUG
       if (dn->last_page_partially_writable)
 	ext2_debug ("made page %u[%lu] in inode %d partially writable",
-		    page, node->allocsize - page, dn->number);
+		    page, node->allocsize - page, node->cache_id);
       else
 	ext2_debug ("made page %u[%u] in inode %d writable",
-		    page, vm_page_size, dn->number);
+		    page, vm_page_size, node->cache_id);
 #endif
 
       rwlock_writer_unlock (&dn->alloc_lock);
@@ -462,7 +462,7 @@ pager_unlock_page (struct user_pager_info *pager, vm_offset_t page)
 	ext2_warning ("This filesystem is out of space, and will now crash.  Bye!");
       else if (err)
 	ext2_warning ("inode=%d, page=0x%x: %s",
-		      dn->number, page, strerror (err));
+		      node->cache_id, page, strerror (err));
 
       return err;
     }
@@ -509,7 +509,7 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred)
 	  block_t old_page_end_block =
 	    round_page (old_size) >> log2_block_size;
 
-	  ext2_debug ("growing inode %d to %u bytes (from %u)", dn->number,
+	  ext2_debug ("growing inode %d to %u bytes (from %u)", node->cache_id,
 		      new_size, old_size);
 
 	  if (dn->last_page_partially_writable
@@ -549,7 +549,7 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred)
 		  ? " (last page writable)": "");
       if (err)
 	ext2_warning ("inode=%d, target=%ld: %s",
-		      dn->number, new_size, strerror (err));
+		      node->cache_id, new_size, strerror (err));
 
       node->allocsize = new_size;
 
diff --git a/ext2fs/storeinfo.c b/ext2fs/storeinfo.c
index cd67db16..7d6bdd23 100644
--- a/ext2fs/storeinfo.c
+++ b/ext2fs/storeinfo.c
@@ -1,6 +1,6 @@
 /* Access to file layout information
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1996 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -115,8 +115,8 @@ diskfs_S_file_get_storage_info (struct protid *cred, int *class,
   else
     *runs_len = 0;
 
-  ((long *)*misc)[0] = htonl (node->dn->number);
-  ((long *)*misc)[1] = htonl (dino (node->dn->number)->i_translator);
+  ((long *)*misc)[0] = htonl (node->cache_id);
+  ((long *)*misc)[1] = htonl (dino (node->cache_id)->i_translator);
 
   *class = STORAGE_DEVICE;
   *flags = 0;