isofs: port to libdiskfs' node cache

* isofs/inode.c: Drop all cache-related code.
(diskfs_user_make_node): New function.
(calculate_file_start): Check for `record' being null.
(cache_id): New function.
(read_node): Rename to diskfs_user_read_node and adopt accordingly.
(diskfs_try_dropping_softrefs): Rename to diskfs_user_try_dropping_softrefs.
* isofs/isofs.h (struct lookup_context): New definition.
(cache_id): New declaration.
* isofs/lookup.c (diskfs_lookup_hard): Adjust accordingly.
* isofs/main.c (fetch_root): Likewise.

1 files changed, 12 insertions, 1 deletions

diff --git a/isofs/isofs.h b/isofs/isofs.h
index 68a94e93..3f6690be 100644
--- a/isofs/isofs.h
+++ b/isofs/isofs.h
@@ -56,6 +56,15 @@ struct user_pager_info
     struct pager *p;
 };
 
+struct lookup_context
+{
+  /* The directory record.  Points somewhere into the disk_image.  */
+  struct dirrect *dr;
+
+  /* The results of an rrip_scan_lookup call for this node.  */
+  struct rrip_lookup rr;
+};
+
 /* The physical media */
 extern struct store *store;
 
@@ -87,7 +96,9 @@ void drop_pager_softrefs (struct node *);
 void allow_pager_softrefs (struct node *);
 void create_disk_pager (void);
 
-error_t load_inode (struct node **, struct dirrect *, struct rrip_lookup *);
+/* Given RECORD and RR, calculate the cache id.  */
+error_t cache_id (struct dirrect *record, struct rrip_lookup *rr, ino_t *idp);
+
 error_t calculate_file_start (struct dirrect *, off_t *, struct rrip_lookup *);
 
 char *isodate_915 (char *, struct timespec *);