]> wimlib.net Git - wimlib/blobdiff - src/mount.c
pre-resolve streams (IN PROGRESS)
[wimlib] / src / mount.c
index 3d0b6396d5c79622f787058c8592168b52bd13a1..ca6197cedb491e28a732968461dcd9e9096a971f 100644 (file)
@@ -73,6 +73,12 @@ static int mount_flags;
 /* Name of the directory on which the WIM file is mounted. */
 static const char *mount_dir;
 
+/* Next hard link group ID to be assigned.  These are also used as the inode
+ * numbers. */
+static u64 next_link_group_id;
+
+/* List of lookup table entries in the staging directory */
+static LIST_HEAD(staging_list);
 
 static inline int get_lookup_flags()
 {
@@ -90,29 +96,37 @@ static inline int flags_writable(int open_flags)
 static int alloc_wimlib_fd(struct lookup_table_entry *lte,
                           struct wimlib_fd **fd_ret)
 {
+       static const u16 fds_per_alloc = 8;
+       static const u16 max_fds = 0xffff;
+
        if (lte->num_opened_fds == lte->num_allocated_fds) {
                struct wimlib_fd **fds;
-               if (lte->num_allocated_fds > 0xffff - 8)
-                       return -ENFILE;
+               u16 num_new_fds;
+
+               if (lte->num_allocated_fds == max_fds)
+                       return -EMFILE;
+               num_new_fds = min(fds_per_alloc, max_fds - lte->num_allocated_fds);
                
-               fds = CALLOC(lte->num_allocated_fds + 8, sizeof(lte->fds[0]));
+               fds = CALLOC(lte->num_allocated_fds + num_new_fds,
+                            sizeof(lte->fds[0]));
                if (!fds)
                        return -ENOMEM;
                memcpy(fds, lte->fds,
                       lte->num_allocated_fds * sizeof(lte->fds[0]));
                FREE(lte->fds);
                lte->fds = fds;
+               lte->num_allocated_fds += num_new_fds;
        }
        for (u16 i = 0; ; i++) {
-               struct wimlib_fd *fd = lte->fds[i];
-               if (!fd) {
-                       fd = CALLOC(1, sizeof(*fd));
+               if (!lte->fds[i]) {
+                       struct wimlib_fd *fd = CALLOC(1, sizeof(*fd));
                        if (!fd)
                                return -ENOMEM;
                        fd->staging_fd = -1;
                        fd->idx        = i;
                        fd->lte        = lte;
                        lte->fds[i]    = fd;
+                       lte->num_opened_fds++;
                        *fd_ret        = fd;
                        return 0;
                }
@@ -131,13 +145,122 @@ static int close_wimlib_fd(struct wimlib_fd *fd)
                if (close(fd->staging_fd) != 0)
                        return -errno;
        }
-       if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
+       if (--lte->num_opened_fds == 0 && lte->refcnt == 0) {
+               if (lte->staging_file_name)
+                       unlink(lte->staging_file_name);
                free_lookup_table_entry(lte);
+       }
        lte->fds[fd->idx] = NULL;
        FREE(fd);
        return 0;
 }
 
+static void remove_dentry(struct dentry *dentry,
+                         struct lookup_table *lookup_table)
+{
+       const u8 *hash = dentry->hash;
+       u16 i = 0;
+       struct lookup_table_entry *lte;
+       while (1) {
+               lte = lookup_table_decrement_refcnt(lookup_table, hash);
+               if (lte && lte->num_opened_fds)
+                       for (u16 i = 0; i < lte->num_allocated_fds; i++)
+                               if (lte->fds[i] && lte->fds[i]->dentry == dentry)
+                                       lte->fds[i]->dentry = NULL;
+               if (i == dentry->num_ads)
+                       break;
+               hash = dentry->ads_entries[i].hash;
+               i++;
+       }
+
+       unlink_dentry(dentry);
+       put_dentry(dentry);
+}
+
+static void dentry_increment_lookup_table_refcnts(struct dentry *dentry,
+                                                 struct lookup_table *lookup_table)
+{
+       u16 i = 0;
+       const u8 *hash = dentry->hash;
+       struct lookup_table_entry *lte;
+       while (1) {
+               lte = __lookup_resource(lookup_table, hash);
+               if (lte)
+                       lte->refcnt++;
+               if (i == dentry->num_ads)
+                       break;
+               hash = dentry->ads_entries[i].hash;
+               i++;
+       }
+}
+
+/* Transfers file attributes from a struct dentry to a `stat' buffer. */
+int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
+{
+       struct lookup_table_entry *lte;
+
+       if (dentry_is_symlink(dentry))
+               stbuf->st_mode = S_IFLNK | 0777;
+       else if (dentry_is_directory(dentry))
+               stbuf->st_mode = S_IFDIR | 0755;
+       else
+               stbuf->st_mode = S_IFREG | 0644;
+
+       stbuf->st_ino = (ino_t)dentry->hard_link;
+
+       stbuf->st_nlink = dentry_link_group_size(dentry);
+       stbuf->st_uid   = getuid();
+       stbuf->st_gid   = getgid();
+
+       /* Use the size of the unnamed (default) file stream. */
+       if ((lte = dentry_lte(dentry))) {
+               if (lte->staging_file_name) {
+                       struct stat native_stat;
+                       if (stat(lte->staging_file_name, &native_stat) != 0)
+                               return -errno;
+                       stbuf->st_size = native_stat.st_size;
+               } else {
+                       stbuf->st_size = lte->resource_entry.original_size;
+               }
+       } else {
+               stbuf->st_size = 0;
+       }
+
+       stbuf->st_atime   = ms_timestamp_to_unix(dentry->last_access_time);
+       stbuf->st_mtime   = ms_timestamp_to_unix(dentry->last_write_time);
+       stbuf->st_ctime   = ms_timestamp_to_unix(dentry->creation_time);
+       stbuf->st_blocks  = (stbuf->st_size + 511) / 512;
+       return 0;
+}
+
+#if 0
+/* Change the hash value of the main or alternate file stream in a hard link
+ * group.  This needs to be done if the hash of the corresponding lookup table
+ * entry was changed. */
+static void link_group_set_stream_hash(struct dentry *dentry,
+                                      unsigned stream_idx,
+                                      const u8 new_hash[])
+{
+       struct list_head *head, *cur;
+
+       if (stream_idx == 0) {
+               head = &dentry->link_group_list;
+               cur = head;
+               do {
+                       dentry = container_of(cur, struct dentry, link_group_list);
+                       memcpy(dentry->hash, new_hash, WIM_HASH_SIZE);
+                       cur = cur->next;
+               } while (cur != head);
+       } else {
+               /* Dentries in the link group share their alternate stream
+                * entries. */
+               wimlib_assert(stream_idx <= dentry->num_ads);
+               memcpy(dentry->ads_entries[stream_idx - 1].hash, new_hash,
+                      WIM_HASH_SIZE);
+       }
+}
+#endif
+
 /* Creates a new staging file and returns its file descriptor opened for
  * writing.
  *
@@ -193,6 +316,152 @@ static int create_staging_file(char **name_ret, int open_flags)
        return fd;
 }
 
+/* Removes open file descriptors from a lookup table entry @old_lte where the
+ * file descriptors have opened the corresponding file resource in the context
+ * of the hard link group @link_group; these file descriptors are extracted and
+ * placed in a new lookup table entry, which is returned. */
+static struct lookup_table_entry *
+lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group)
+{
+       int ret;
+       u16 num_transferred_fds;
+       struct lookup_table_entry *new_lte;
+
+       new_lte = new_lookup_table_entry();
+       if (!new_lte)
+               return NULL;
+
+       num_transferred_fds = 0;
+       for (u16 i = 0; i < old_lte->num_allocated_fds; i++)
+               if (old_lte->fds[i] &&
+                   old_lte->fds[i]->dentry->hard_link == link_group)
+                       num_transferred_fds++;
+       DEBUG("Transferring %u file descriptors",
+             num_transferred_fds);
+       new_lte->fds = MALLOC(num_transferred_fds * sizeof(new_lte->fds[0]));
+       if (!new_lte->fds) {
+               FREE(new_lte);
+               return NULL;
+       }
+       for (u16 i = 0, j = 0; ; i++) {
+               if (old_lte->fds[i] &&
+                   old_lte->fds[i]->dentry->hard_link == link_group) {
+                       struct wimlib_fd *fd = old_lte->fds[i];
+                       old_lte->fds[i] = NULL;
+                       fd->lte = new_lte;
+                       fd->idx = j;
+                       new_lte->fds[j] = fd;
+                       if (++j == num_transferred_fds)
+                               break;
+               }
+       }
+       old_lte->num_opened_fds -= num_transferred_fds;
+       new_lte->num_opened_fds = num_transferred_fds;
+       new_lte->num_allocated_fds = num_transferred_fds;
+       return new_lte;
+}
+
+/* 
+ * Transfers an alternate data stream entry to a new lookup table entry
+ */
+static void lte_transfer_ads_entry(struct lookup_table_entry *new_lte,
+                                  struct ads_entry *ads_entry)
+{
+       list_del(&ads_entry->lte_group_list.list);
+       list_add(&ads_entry->lte_group_list.list, &new_lte->lte_group_list);
+       ads_entry->lte = new_lte;
+}
+
+/* 
+ * Transfers a dentry to a new lookup table entry
+ */
+static void lte_transfer_dentry(struct lookup_table_entry *new_lte,
+                               struct dentry *dentry)
+{
+       list_del(&dentry->lte_group_list.list);
+       list_add(&dentry->lte_group_list.list, &new_lte->lte_group_list);
+       dentry->lte = new_lte;
+}
+
+static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte,
+                                       struct dentry *dentry,
+                                       unsigned stream_idx)
+{
+       INIT_LIST_HEAD(&new_lte->lte_group_list);
+       if (stream_idx == 0) {
+               struct list_head *pos;
+               do {
+                       struct dentry *d;
+                       d = container_of(pos, struct dentry, link_group_list);
+                       lte_transfer_dentry(new_lte, d);
+
+                       pos = pos->next;
+               } while (pos != &dentry->link_group_list);
+       } else {
+               struct ads_entry *ads_entry;
+               ads_entry = &dentry->ads_entries[stream_idx - 1];
+               lte_transfer_ads_entry(new_lte, ads_entry);
+       }
+}
+
+#if 0
+/*
+ * Transfers streams part of a hard-link group from @old_lte to @new_lte.
+ *
+ * @dentry is one of the dentries in the hard link group
+ * @stream_idx is the index of the stream that we're transferring.
+ */
+static void lte_transfer_stream_entries(struct lookup_table_entry *old_lte,
+                                       struct lookup_table_entry *new_lte,
+                                       struct dentry *dentry, unsigned stream_idx)
+{
+       INIT_LIST_HEAD(&new_lte->lte_group_list);
+
+       if (stream_idx == 0) {
+               struct list_head *pos;
+               struct stream_list_head *head;
+               struct dentry *other_dentry;
+               list_for_each(pos, &old_lte->lte_group_list) {
+                       head = container_of(pos, struct stream_list_head, head);
+                       if (head->type != STREAM_TYPE_NORMAL) {
+                               continue;
+                       other_dentry = container_of(head, struct dentry,
+                                                   lte_group_list);
+                       if (other_dentry->hard_link != dentry->link_group)
+                               continue;
+
+                       list_del(&other_dentry->lte_group_list.list);
+                       list_add(&other_dentry->lte_group_list.list,
+                                &new_lte->lte_group_list);
+                       other_dentry->lte = new_lte;
+               }
+       } else {
+               /* ADS entries are shared within a hard link group. */
+               lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]);
+       }
+}
+static void lte__stream_entries(struct lookup_table_entry *new_lte,
+                                   struct dentry *dentry, unsigned stream_idx)
+{
+       INIT_LIST_HEAD(new_lte->lte_group_list);
+       if (stream_idx == 0) {
+               struct list_head *cur;
+               do {
+                       struct dentry *d;
+
+                       d = container_of(cur, struct dentry, link_group_list);
+                       list_del(&d->lte_group_list);
+                       list_add(&d->lte_group_list, &new_lte->lte_group_list);
+                       d->lte = new_lte;
+                       cur = cur->next;
+               } while (cur != &dentry->link_group_list);
+       } else {
+               lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]);
+       }
+}
+#endif
+
+
 /* 
  * Extract a WIM resource to the staging directory.
  *
@@ -205,6 +474,7 @@ static int create_staging_file(char **name_ret, int open_flags)
  *   dentry
  */
 static int extract_resource_to_staging_dir(struct dentry *dentry,
+                                          unsigned stream_idx,
                                           struct lookup_table_entry **lte,
                                           off_t size)
 {
@@ -213,7 +483,9 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
        int fd;
        struct lookup_table_entry *old_lte, *new_lte;
        size_t link_group_size;
-       
+
+       DEBUG("Extracting resource `%s' to staging directory", dentry->full_path_utf8);
+
        old_lte = *lte;
        fd = create_staging_file(&staging_file_name, O_WRONLY);
        if (fd == -1)
@@ -230,9 +502,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                else
                        ret = -EIO;
                close(fd);
-               unlink(staging_file_name);
-               FREE(staging_file_name);
-               return ret;
+               goto out_delete_staging_file;
        }
 
        link_group_size = dentry_link_group_size(dentry);
@@ -241,9 +511,13 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                if (link_group_size == old_lte->refcnt) {
                        /* This hard link group is the only user of the lookup
                         * table entry, so we can re-use it. */
+                       DEBUG("Re-using lookup table entry");
                        lookup_table_remove(w->lookup_table, old_lte);
                        new_lte = old_lte;
                } else {
+                       DEBUG("Splitting lookup table entry "
+                             "(link_group_size = %u, lte refcnt = %u)",
+                             link_group_size, old_lte->refcnt);
                        /* Split a hard link group away from the "lookup table
                         * entry" hard link group (i.e. we had two hard link
                         * groups that were identical, but now we are changing
@@ -257,43 +531,24 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                         * streams themselves are not hardlinked. */
                        wimlib_assert(old_lte->refcnt > link_group_size);
 
-                       new_lte = new_lookup_table_entry();
-                       if (!new_lte)
-                               return -ENOMEM;
-
-                       u16 num_transferred_fds = 0;
-                       for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
-                               if (old_lte->fds[i] &&
-                                   old_lte->fds[i]->dentry->hard_link ==
-                                     dentry->hard_link)
-                               {
-                                       num_transferred_fds++;
-                               }
+                       new_lte = lte_extract_fds(old_lte, dentry->hard_link);
+                       if (!new_lte) {
+                               ret = -ENOMEM;
+                               goto out_delete_staging_file;
                        }
-                       new_lte->fds = MALLOC(num_transferred_fds *
-                                             sizeof(new_lte->fds[0]));
-                       if (!new_lte->fds) {
-                               free_lookup_table_entry(new_lte);
-                               return -ENOMEM;
-                       }
-                       u16 j = 0;
-                       for (u16 i = 0; i < old_lte->num_allocated_fds; i++) {
-                               if (old_lte->fds[i] &&
-                                   old_lte->fds[i]->dentry->hard_link ==
-                                     dentry->hard_link)
-                               {
-                                       struct wimlib_fd *fd = old_lte->fds[i];
-                                       old_lte->fds[i] = NULL;
-                                       fd->lte = new_lte;
-                                       fd->idx = j;
-                                       new_lte->fds[j] = fd;
-                               }
-                       }
-                       old_lte->refcnt -= link_group_size;
-                       old_lte->num_opened_fds -= j;
-                       new_lte->num_opened_fds = j;
 
+                       lte_transfer_stream_entries(new_lte, dentry, stream_idx);
+                       old_lte->refcnt -= link_group_size;
                } 
+       } else {
+               /* No old_lte was supplied, so the resource had no lookup table
+                * entry before (it must be an empty resource) */
+               new_lte = new_lookup_table_entry();
+               if (!new_lte) {
+                       ret = -ENOMEM;
+                       goto out_delete_staging_file;
+               }
+               lte_transfer_stream_entries(new_lte, dentry, stream_idx);
        }
        new_lte->resource_entry.original_size = size;
        new_lte->refcnt = link_group_size;
@@ -301,8 +556,13 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
        new_lte->staging_file_name = staging_file_name;
 
        lookup_table_insert(w->lookup_table, new_lte);
+       list_add(&new_lte->staging_list, &staging_list);
        *lte = new_lte;
        return 0;
+out_delete_staging_file:
+       unlink(staging_file_name);
+       FREE(staging_file_name);
+       return ret;
 }
 
 /* 
@@ -539,15 +799,16 @@ static int wimfs_access(const char *path, int mask)
 
 /* Closes the staging file descriptor associated with the lookup table entry, if
  * it is opened. */
-static int close_lte_fds(struct lookup_table_entry *lte, void *ignore)
+static int close_lte_fds(struct lookup_table_entry *lte)
 {
-       for (u16 i = 0; i < lte->num_opened_fds; i++) {
+       for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) {
                if (lte->fds[i] && lte->fds[i]->staging_fd != -1) {
                        if (close(lte->fds[i]->staging_fd) != 0) {
                                ERROR_WITH_ERRNO("Failed close file `%s'",
                                                 lte->staging_file_name);
                                return WIMLIB_ERR_WRITE;
                        }
+                       j++;
                }
        }
        return 0;
@@ -558,10 +819,10 @@ static int close_lte_fds(struct lookup_table_entry *lte, void *ignore)
  * file.  Updates the SHA1 sum in the dentry and the lookup table entry.  If
  * there is already a lookup table entry with the same checksum, increment its
  * reference count and destroy the lookup entry with the updated checksum. */
-static int calculate_sha1sum_for_staging_file(struct dentry *dentry,
-                                             void *_lookup_table)
+static int calculate_sha1sum_of_staging_file(struct dentry *dentry,
+                                            void *__lookup_table)
 {
-       struct lookup_table *lookup_table =  _lookup_table;
+       struct lookup_table *lookup_table =  __lookup_table;
        u8 *hash = dentry->hash;
        u16 i = 0;
        while (1) {
@@ -600,27 +861,23 @@ static int calculate_sha1sum_for_staging_file(struct dentry *dentry,
 static int rebuild_wim(WIMStruct *w, bool check_integrity)
 {
        int ret;
-       struct dentry *root;
-
-       root = wim_root_dentry(w);
+       struct lookup_table_entry *lte;
 
-       DEBUG("Closing all staging file descriptors.");
        /* Close all the staging file descriptors. */
-       ret = for_lookup_table_entry(w->lookup_table, close_lte_fds, NULL);
-       if (ret != 0) {
-               ERROR("Failed to close all staging files");
-               return ret;
+       DEBUG("Closing all staging file descriptors.");
+       list_for_each_entry(lte, &staging_list, staging_list) {
+               ret = close_lte_fds(lte);
+               if (ret != 0)
+                       return ret;
        }
 
-       DEBUG("Calculating SHA1 checksums for all new staging files.");
        /* Calculate SHA1 checksums for all staging files, and merge unnecessary
         * lookup table entries. */
-       ret = for_dentry_in_tree(root, calculate_sha1sum_for_staging_file,
-                                w->lookup_table);
-       if (ret != 0) {
-               ERROR("Failed to calculate new SHA1 checksums");
+       DEBUG("Calculating SHA1 checksums for all new staging files.");
+       ret = for_dentry_in_tree(wim_root_dentry(w),
+                                calculate_sha1sum_of_staging_file, w->lookup_table);
+       if (ret != 0)
                return ret;
-       }
 
        xml_update_image_info(w, w->current_image);
 
@@ -635,7 +892,6 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity)
 /* Called when the filesystem is unmounted. */
 static void wimfs_destroy(void *p)
 {
-
        /* For read-write mounts, the `imagex unmount' command, which is
         * running in a separate process and is executing the
         * wimlib_unmount() function, will send this process a byte
@@ -708,6 +964,21 @@ done:
        close_message_queues();
 }
 
+static int wimfs_fallocate(const char *path, int mode,
+                          off_t offset, off_t len, struct fuse_file_info *fi)
+{
+       struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+       wimlib_assert(fd->staging_fd != -1);
+       return fallocate(fd->staging_fd, mode, offset, len);
+}
+
+static int wimfs_fgetattr(const char *path, struct stat *stbuf,
+                         struct fuse_file_info *fi)
+{
+       struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
+       return dentry_to_stbuf(fd->dentry, stbuf);
+}
+
 static int wimfs_ftruncate(const char *path, off_t size,
                           struct fuse_file_info *fi)
 {
@@ -727,10 +998,57 @@ static int wimfs_getattr(const char *path, struct stat *stbuf)
        struct dentry *dentry = get_dentry(w, path);
        if (!dentry)
                return -ENOENT;
-       dentry_to_stbuf(dentry, stbuf, w->lookup_table);
+       return dentry_to_stbuf(dentry, stbuf);
+}
+
+static int wimfs_getxattr(const char *path, const char *name, char *value,
+                         size_t size)
+{
+       /* XXX */
+       return -ENOTSUP;
+}
+
+/* Create a hard link */
+static int wimfs_link(const char *to, const char *from)
+{
+       struct dentry *to_dentry, *from_dentry, *from_dentry_parent;
+       const char *link_name;
+
+       to_dentry = get_dentry(w, to);
+       if (!to_dentry)
+               return -ENOENT;
+       if (!dentry_is_regular_file(to_dentry))
+               return -EPERM;
+
+       from_dentry_parent = get_parent_dentry(w, from);
+       if (!from_dentry_parent)
+               return -ENOENT;
+       if (!dentry_is_directory(from_dentry_parent))
+               return -ENOTDIR;
+
+       link_name = path_basename(from);
+       if (get_dentry_child_with_name(from_dentry_parent, link_name))
+               return -EEXIST;
+       from_dentry = clone_dentry(to_dentry);
+       if (!from_dentry)
+               return -ENOMEM;
+       if (change_dentry_name(from_dentry, link_name) != 0) {
+               FREE(from_dentry);
+               return -ENOMEM;
+       }
+       list_add(&from_dentry->link_group_list, &to_dentry->link_group_list);
+       link_dentry(from_dentry, from_dentry_parent);
+       dentry_increment_lookup_table_refcnts(from_dentry, w->lookup_table);
+       from_dentry->link_group_master_status = GROUP_SLAVE;
        return 0;
 }
 
+static int wimfs_listxattr(const char *path, char *list, size_t size)
+{
+       /* XXX */
+       return -ENOTSUP;
+}
+
 /* 
  * Create a directory in the WIM.  
  * @mode is currently ignored.
@@ -787,11 +1105,15 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                        return -ENOENT;
                if (!dentry_is_directory(parent))
                        return -ENOTDIR;
+
                basename = path_basename(path);
                if (get_dentry_child_with_name(parent, path))
                        return -EEXIST;
 
                dentry = new_dentry(basename);
+               if (!dentry)
+                       return -ENOMEM;
+               dentry->hard_link = next_link_group_id++;
                link_dentry(dentry, parent);
        }
        return 0;
@@ -806,9 +1128,10 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
        u8 *dentry_hash;
        int ret;
        struct wimlib_fd *fd;
+       unsigned stream_idx;
 
        ret = lookup_resource(w, path, get_lookup_flags(), &dentry, &lte,
-                             &dentry_hash);
+                             &stream_idx);
        if (ret != 0)
                return ret;
 
@@ -823,8 +1146,8 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
                        return 0;
                }
 
-               ret = extract_resource_to_staging_dir(dentry, &lte,
-                                                     lte->resource_entry.original_size);
+               ret = extract_resource_to_staging_dir(dentry, stream_idx,
+                                                     &lte, 0);
                if (ret != 0)
                        return ret;
        }
@@ -843,7 +1166,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
         * but we need to extract the resource to the staging directory
         * if we are opening it writable. */
        if (flags_writable(fi->flags) && !lte->staging_file_name) {
-               ret = extract_resource_to_staging_dir(dentry, &lte,
+               ret = extract_resource_to_staging_dir(dentry, stream_idx, &lte,
                                                      lte->resource_entry.original_size);
                if (ret != 0)
                        return ret;
@@ -865,8 +1188,11 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
        struct dentry *dentry;
        
        dentry = get_dentry(w, path);
-       if (!dentry || !dentry_is_directory(dentry))
+       if (!dentry)
+               return -ENOENT;
+       if (!dentry_is_directory(dentry))
                return -ENOTDIR;
+       dentry->num_times_opened++;
        fi->fh = (uint64_t)dentry;
        return 0;
 }
@@ -893,6 +1219,7 @@ static int wimfs_read(const char *path, char *buf, size_t size,
                wimlib_assert(fd->staging_fd != -1);
 
                ssize_t ret;
+               DEBUG("Seek to offset %zu", offset);
 
                if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
                        return -errno;
@@ -977,15 +1304,44 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi)
                wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE));
                return 0;
        }
+
+       if (flags_writable(fi->flags) && fd->dentry) {
+               u64 now = get_timestamp();
+               fd->dentry->last_access_time = now;
+               fd->dentry->last_write_time = now;
+       }
+
        return close_wimlib_fd(fd);
 }
 
+static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+{
+       struct dentry *dentry = (struct dentry *)fi->fh;
+
+       wimlib_assert(dentry->num_times_opened);
+       if (--dentry->num_times_opened == 0)
+               free_dentry(dentry);
+       return 0;
+}
+
+static int wimfs_removexattr(const char *path, const char *name)
+{
+       /* XXX */
+       return -ENOTSUP;
+}
+
 /* Renames a file or directory.  See rename (3) */
 static int wimfs_rename(const char *from, const char *to)
 {
        struct dentry *src;
        struct dentry *dst;
        struct dentry *parent_of_dst;
+       char *file_name_utf16 = NULL, *file_name_utf8 = NULL;
+       u16 file_name_utf16_len, file_name_utf8_len;
+       int ret;
+
+       /* This rename() implementation currently only supports actual files
+        * (not alternate data streams) */
        
        src = get_dentry(w, from);
        if (!src)
@@ -993,7 +1349,17 @@ static int wimfs_rename(const char *from, const char *to)
 
        dst = get_dentry(w, to);
 
+
+       ret = get_names(&file_name_utf16, &file_name_utf8,
+                       &file_name_utf16_len, &file_name_utf8_len,
+                       path_basename(to));
+       if (ret != 0)
+               return -ENOMEM;
+
        if (dst) {
+               if (src == dst) /* Same file */
+                       return 0;
+
                if (!dentry_is_directory(src)) {
                        /* Cannot rename non-directory to directory. */
                        if (dentry_is_directory(dst))
@@ -1007,19 +1373,22 @@ static int wimfs_rename(const char *from, const char *to)
                                return -ENOTEMPTY;
                }
                parent_of_dst = dst->parent;
-               unlink_dentry(dst);
-               lookup_table_decrement_refcnt(w->lookup_table, dst->hash);
-               free_dentry(dst);
+               remove_dentry(dst, w->lookup_table);
        } else {
                parent_of_dst = get_parent_dentry(w, to);
                if (!parent_of_dst)
                        return -ENOENT;
        }
 
+       FREE(src->file_name);
+       FREE(src->file_name_utf8);
+       src->file_name          = file_name_utf16;
+       src->file_name_utf8     = file_name_utf8;
+       src->file_name_len      = file_name_utf16_len;
+       src->file_name_utf8_len = file_name_utf8_len;
+
        unlink_dentry(src);
-       change_dentry_name(src, path_basename(to));
        link_dentry(src, parent_of_dst);
-       /*calculate_dentry_full_path(src);*/
        return 0;
 }
 
@@ -1036,10 +1405,56 @@ static int wimfs_rmdir(const char *path)
                return -ENOTEMPTY;
 
        unlink_dentry(dentry);
-       free_dentry(dentry);
+       if (dentry->num_times_opened == 0)
+               free_dentry(dentry);
        return 0;
 }
 
+static int wimfs_setxattr(const char *path, const char *name,
+                         const char *value, size_t size, int flags)
+{
+       /* XXX */
+       return -ENOTSUP;
+}
+
+static int wimfs_symlink(const char *to, const char *from)
+{
+       struct dentry *dentry_parent, *dentry;
+       const char *link_name;
+       struct lookup_table_entry *lte;
+       
+       dentry_parent = get_parent_dentry(w, from);
+       if (!dentry_parent)
+               return -ENOENT;
+       if (!dentry_is_directory(dentry_parent))
+               return -ENOTDIR;
+
+       link_name = path_basename(from);
+
+       if (get_dentry_child_with_name(dentry_parent, link_name))
+               return -EEXIST;
+       dentry = new_dentry(link_name);
+       if (!dentry)
+               return -ENOMEM;
+
+       dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
+       dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+
+       if (dentry_set_symlink(dentry, to, w->lookup_table, &lte) != 0)
+               goto out_free_dentry;
+
+       dentry->ads_entries[1].lte_group_list.type = STREAM_TYPE_ADS;
+       list_add(&dentry->ads_entries[1].lte_group_list.list,
+                &lte->lte_group_list);
+       dentry->ads_entries[1].lte = lte;
+
+       link_dentry(dentry, dentry_parent);
+       return 0;
+out_free_dentry:
+       free_dentry(dentry);
+       return -ENOMEM;
+}
+
 
 /* Reduce the size of a file */
 static int wimfs_truncate(const char *path, off_t size)
@@ -1047,10 +1462,10 @@ static int wimfs_truncate(const char *path, off_t size)
        struct dentry *dentry;
        struct lookup_table_entry *lte;
        int ret;
-       u8 *dentry_hash;
+       unsigned stream_idx;
        
        ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
-                             &lte, &dentry_hash);
+                             &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
@@ -1066,7 +1481,8 @@ static int wimfs_truncate(const char *path, off_t size)
        } else {
                /* File in WIM.  Extract it to the staging directory, but only
                 * the first @size bytes of it. */
-               ret = extract_resource_to_staging_dir(dentry, &lte, size);
+               ret = extract_resource_to_staging_dir(dentry, stream_idx,
+                                                     &lte, size);
        }
        dentry_update_all_timestamps(dentry);
        return ret;
@@ -1079,40 +1495,26 @@ static int wimfs_unlink(const char *path)
        struct lookup_table_entry *lte;
        int ret;
        u8 *dentry_hash;
+       unsigned stream_idx;
        
        ret = lookup_resource(w, path, get_lookup_flags(), &dentry,
-                             &lte, &dentry_hash);
+                             &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
 
-       if (lte && lte->staging_file_name)
-               if (unlink(lte->staging_file_name) != 0)
-                       return -errno;
-
-       if (dentry_hash == dentry->hash) {
+       if (stream_idx == 0) {
                /* We are removing the full dentry including all alternate data
                 * streams. */
-               const u8 *hash = dentry->hash;
-               u16 i = 0;
-               while (1) {
-                       lookup_table_decrement_refcnt(w->lookup_table, hash);
-                       if (i == dentry->num_ads)
-                               break;
-                       hash = dentry->ads_entries[i].hash;
-                       i++;
-               }
-
-               unlink_dentry(dentry);
-               free_dentry(dentry);
+               remove_dentry(dentry, w->lookup_table);
        } else {
                /* We are removing an alternate data stream. */
-               struct ads_entry *cur_entry = dentry->ads_entries;
-               while (cur_entry->hash != dentry_hash)
-                       cur_entry++;
-               lookup_table_decrement_refcnt(w->lookup_table, cur_entry->hash);
+               struct ads_entry *ads_entry;
                
-               dentry_remove_ads(dentry, cur_entry);
+               ads_entry = &dentry->ads_entries[stream_idx - 1];
+               lte_decrement_refcnt(lte, w->lookup_table);
+               list_del(&ads_entry->lte_group_list.list);
+               dentry_remove_ads(dentry, ads_entry);
        }
        /* Beware: The lookup table entry(s) may still be referenced by users
         * that have opened the corresponding streams.  They are freed later in
@@ -1150,38 +1552,47 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
        wimlib_assert(fd->lte->staging_file_name);
        wimlib_assert(fd->staging_fd != -1);
 
+       /* Seek to the requested position */
+       if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
+               return -errno;
+
        /* Write the data. */
        ret = write(fd->staging_fd, buf, size);
        if (ret == -1)
                return -errno;
 
-       /* The file has been modified, so all its timestamps must be
-        * updated. */
-       dentry_update_all_timestamps(fd->dentry);
-
        return ret;
 }
 
 
-static struct fuse_operations wimfs_oper = {
-       .access    = wimfs_access,
-       .destroy   = wimfs_destroy,
-       .ftruncate = wimfs_ftruncate,
-       .getattr   = wimfs_getattr,
-       .mkdir     = wimfs_mkdir,
-       .mknod     = wimfs_mknod,
-       .open      = wimfs_open,
-       .opendir   = wimfs_opendir,
-       .read      = wimfs_read,
-       .readdir   = wimfs_readdir,
-       .readlink  = wimfs_readlink,
-       .release   = wimfs_release,
-       .rename    = wimfs_rename,
-       .rmdir     = wimfs_rmdir,
-       .truncate  = wimfs_truncate,
-       .unlink    = wimfs_unlink,
-       .utimens   = wimfs_utimens,
-       .write     = wimfs_write,
+static struct fuse_operations wimfs_operations = {
+       .access      = wimfs_access,
+       .destroy     = wimfs_destroy,
+       .fallocate   = wimfs_fallocate,
+       .fgetattr    = wimfs_fgetattr,
+       .ftruncate   = wimfs_ftruncate,
+       .getattr     = wimfs_getattr,
+       .getxattr    = wimfs_getxattr,
+       .link        = wimfs_link,
+       .listxattr   = wimfs_listxattr,
+       .mkdir       = wimfs_mkdir,
+       .mknod       = wimfs_mknod,
+       .open        = wimfs_open,
+       .opendir     = wimfs_opendir,
+       .read        = wimfs_read,
+       .readdir     = wimfs_readdir,
+       .readlink    = wimfs_readlink,
+       .release     = wimfs_release,
+       .releasedir  = wimfs_releasedir,
+       .removexattr = wimfs_removexattr,
+       .rename      = wimfs_rename,
+       .rmdir       = wimfs_rmdir,
+       .setxattr    = wimfs_setxattr,
+       .symlink     = wimfs_symlink,
+       .truncate    = wimfs_truncate,
+       .unlink      = wimfs_unlink,
+       .utimens     = wimfs_utimens,
+       .write       = wimfs_write,
 };
 
 
@@ -1190,7 +1601,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
                           int flags)
 {
        int argc = 0;
-       char *argv[6];
+       char *argv[16];
        int ret;
        char *p;
 
@@ -1205,6 +1616,12 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
        if (ret != 0)
                return ret;
 
+       DEBUG("Selected image %d", image);
+
+       next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt);
+
+       resolve_lookup_table_entries(wim_root_dentry(wim), w->lookup_table);
+
        if (flags & WIMLIB_MOUNT_FLAG_READWRITE)
                wim_get_current_image_metadata(wim)->modified = true;
 
@@ -1231,16 +1648,19 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
        if (flags & WIMLIB_MOUNT_FLAG_DEBUG) {
                argv[argc++] = "-d";
        }
-       if (!(flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
-               argv[argc++] = "-o";
-               argv[argc++] = "ro";
-       } else {
+       char optstring[256] = "use_ino";
+       argv[argc++] = "-o";
+       argv[argc++] = optstring;
+       if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
                make_staging_dir();
                if (!staging_dir_name) {
                        FREE(p);
                        return WIMLIB_ERR_MKDIR;
                }
+       } else {
+               strcat(optstring, ",ro");
        }
+       argv[argc] = NULL;
 
 #ifdef ENABLE_DEBUG
        {
@@ -1259,7 +1679,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir,
        w = wim;
        mount_flags = flags;
 
-       ret = fuse_main(argc, argv, &wimfs_oper, NULL);
+       ret = fuse_main(argc, argv, &wimfs_operations, NULL);
 
        return (ret == 0) ? 0 : WIMLIB_ERR_FUSE;
 }