wimlib_mount_image(): Correctly return NOMEM in one case
[wimlib] / src / mount_image.c
index e361ddb..41478d9 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/error.h"
 
 #ifdef WITH_FUSE
 
-#include "sha1.h"
-#include "lookup_table.h"
-#include "xml.h"
-#include "buffer_io.h"
-#include "timestamp.h"
+#ifdef __WIN32__
+#  error "FUSE mount not supported on Win32!  Please configure --without-fuse"
+#endif
+
+#include "wimlib/encoding.h"
+#include "wimlib/file_io.h"
+#include "wimlib/dentry.h"
+#include "wimlib/inode.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/paths.h"
+#include "wimlib/reparse.h"
+#include "wimlib/resource.h"
+#include "wimlib/timestamp.h"
+#include "wimlib/version.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
+
+#include <errno.h>
+#include <ftw.h>
 #include <limits.h>
+#include <mqueue.h>
+#include <signal.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#define FUSE_USE_VERSION 26
-#include <errno.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/time.h>
-#include <fuse.h>
-#include <ftw.h>
-#include <mqueue.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #include <utime.h>
-#include <signal.h>
+
+#define FUSE_USE_VERSION 26
+#include <fuse.h>
 
 #ifdef ENABLE_XATTR
 #include <attr/xattr.h>
 #define MSG_BREAK_LOOP         -2
 
 /* File descriptor to a file open on the WIM filesystem. */
-struct wimlib_fd {
-       struct inode *f_inode;
-       struct lookup_table_entry *f_lte;
-       int staging_fd;
+struct wimfs_fd {
+       struct wim_inode *f_inode;
+       struct wim_lookup_table_entry *f_lte;
+       struct filedes staging_fd;
        u16 idx;
        u32 stream_id;
 };
@@ -80,61 +101,71 @@ struct wimfs_context {
        /* Flags passed to wimlib_mount(). */
        int mount_flags;
 
+       /* Default flags to use when looking up a WIM dentry (depends on whether
+        * the Windows interface to alternate data streams is being used or
+        * not). */
        int default_lookup_flags;
 
-       /* Next inode number to be assigned. */
+       /* Next inode number to be assigned.  Note: I didn't bother with a
+        * bitmap of free inode numbers since this isn't even a "real"
+        * filesystem anyway. */
        u64 next_ino;
 
-       /* List of lookup table entries in the staging directory */
-       struct list_head staging_list;
-
        /* List of inodes in the mounted image */
-       struct hlist_head *image_inode_list;
-
-       /* Name and message queue descriptors for message queues between the filesystem
-        * daemon process and the unmount process.  These are used when the filesystem
-        * is unmounted and the process running wimlib_mount() (i.e. the `imagex
-        * unmount' command) needs to communicate with the filesystem daemon running
-        * fuse_main() (i.e. that spawned by the `imagex mount' or `imagex mountrw'
-        * commands */
+       struct list_head *image_inode_list;
+
+       /* Name and message queue descriptors for message queues between the
+        * filesystem daemon process and the unmount process.  These are used
+        * when the filesystem is unmounted and the process running
+        * wimlib_unmount_image() needs to communicate with the filesystem
+        * daemon running fuse_main() (i.e. the process created by a call to
+        * wimlib_mount_image().  */
        char *unmount_to_daemon_mq_name;
        char *daemon_to_unmount_mq_name;
        mqd_t unmount_to_daemon_mq;
        mqd_t daemon_to_unmount_mq;
+
+       uid_t default_uid;
+       gid_t default_gid;
+
+       int status;
+       bool have_status;
 };
 
-static void init_wimfs_context(struct wimfs_context *ctx)
+static void
+init_wimfs_context(struct wimfs_context *ctx)
 {
        memset(ctx, 0, sizeof(*ctx));
        ctx->unmount_to_daemon_mq = (mqd_t)-1;
        ctx->daemon_to_unmount_mq = (mqd_t)-1;
-       INIT_LIST_HEAD(&ctx->staging_list);
 }
 
-static inline struct wimfs_context *wimfs_get_context()
-{
-       return (struct wimfs_context*)fuse_get_context()->private_data;
-}
+#define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
 
-static inline WIMStruct *wimfs_get_WIMStruct()
+static inline struct wimfs_context *
+wimfs_get_context(void)
 {
-       return wimfs_get_context()->wim;
+       return WIMFS_CTX(fuse_get_context());
 }
 
-static inline bool wimfs_ctx_readonly(const struct wimfs_context *ctx)
+static inline WIMStruct *
+wimfs_get_WIMStruct(void)
 {
-       return (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) == 0;
+       return wimfs_get_context()->wim;
 }
 
-static inline int get_lookup_flags(const struct wimfs_context *ctx)
+static inline int
+get_lookup_flags(const struct wimfs_context *ctx)
 {
        return ctx->default_lookup_flags;
 }
 
 /* Returns nonzero if write permission is requested on the file open flags */
-static inline int flags_writable(int open_flags)
+static inline int
+flags_writable(int open_flags)
 {
-       return open_flags & (O_RDWR | O_WRONLY);
+       int accmode = (open_flags & O_ACCMODE);
+       return (accmode == O_RDWR || accmode == O_WRONLY);
 }
 
 /*
@@ -144,65 +175,63 @@ static inline int flags_writable(int open_flags)
  * @stream_id: ID of the stream we're opening
  * @lte:       Lookup table entry for the stream (may be NULL)
  * @fd_ret:    Return the allocated file descriptor if successful.
- * @readonly:  True if this is a read-only mount.
  *
  * Return 0 iff successful or error code if unsuccessful.
  */
-static int alloc_wimlib_fd(struct inode *inode,
-                          u32 stream_id,
-                          struct lookup_table_entry *lte,
-                          struct wimlib_fd **fd_ret,
-                          bool readonly)
+static int
+alloc_wimfs_fd(struct wim_inode *inode,
+              u32 stream_id,
+              struct wim_lookup_table_entry *lte,
+              struct wimfs_fd **fd_ret)
 {
        static const u16 fds_per_alloc = 8;
        static const u16 max_fds = 0xffff;
        int ret;
 
-       pthread_mutex_lock(&inode->i_mutex);
-
-       DEBUG("Allocating fd for stream ID %u from inode %lx (open = %u, allocated = %u)",
-             stream_id, inode->ino, inode->num_opened_fds,
-             inode->num_allocated_fds);
+       DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" "
+             "(open = %u, allocated = %u)",
+             stream_id, inode->i_ino, inode->i_num_opened_fds,
+             inode->i_num_allocated_fds);
 
-       if (inode->num_opened_fds == inode->num_allocated_fds) {
-               struct wimlib_fd **fds;
+       if (inode->i_num_opened_fds == inode->i_num_allocated_fds) {
+               struct wimfs_fd **fds;
                u16 num_new_fds;
 
-               if (inode->num_allocated_fds == max_fds) {
+               if (inode->i_num_allocated_fds == max_fds) {
                        ret = -EMFILE;
                        goto out;
                }
                num_new_fds = min(fds_per_alloc,
-                                 max_fds - inode->num_allocated_fds);
+                                 max_fds - inode->i_num_allocated_fds);
 
-               fds = REALLOC(inode->fds,
-                             (inode->num_allocated_fds + num_new_fds) *
-                               sizeof(inode->fds[0]));
+               fds = REALLOC(inode->i_fds,
+                             (inode->i_num_allocated_fds + num_new_fds) *
+                               sizeof(inode->i_fds[0]));
                if (!fds) {
                        ret = -ENOMEM;
                        goto out;
                }
-               memset(&fds[inode->num_allocated_fds], 0,
+               memset(&fds[inode->i_num_allocated_fds], 0,
                       num_new_fds * sizeof(fds[0]));
-               inode->fds = fds;
-               inode->num_allocated_fds += num_new_fds;
+               inode->i_fds = fds;
+               inode->i_num_allocated_fds += num_new_fds;
        }
        for (u16 i = 0; ; i++) {
-               if (!inode->fds[i]) {
-                       struct wimlib_fd *fd = CALLOC(1, sizeof(*fd));
+               if (!inode->i_fds[i]) {
+                       struct wimfs_fd *fd = CALLOC(1, sizeof(*fd));
                        if (!fd) {
                                ret = -ENOMEM;
                                break;
                        }
-                       fd->f_inode    = inode;
-                       fd->f_lte      = lte;
-                       fd->staging_fd = -1;
-                       fd->idx        = i;
-                       fd->stream_id  = stream_id;
-                       *fd_ret        = fd;
-                       inode->fds[i]  = fd;
-                       inode->num_opened_fds++;
-                       if (lte && !readonly)
+                       fd->f_inode     = inode;
+                       fd->f_lte       = lte;
+                       filedes_invalidate(&fd->staging_fd);
+                       fd->idx         = i;
+                       fd->stream_id   = stream_id;
+                       *fd_ret         = fd;
+                       inode->i_fds[i] = fd;
+                       inode->i_num_opened_fds++;
+                       if (lte)
                                lte->num_opened_fds++;
                        DEBUG("Allocated fd (idx = %u)", fd->idx);
                        ret = 0;
@@ -210,32 +239,31 @@ static int alloc_wimlib_fd(struct inode *inode,
                }
        }
 out:
-       pthread_mutex_unlock(&inode->i_mutex);
        return ret;
 }
 
-static void inode_put_fd(struct inode *inode, struct wimlib_fd *fd)
+static void
+inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 {
        wimlib_assert(inode != NULL);
-
-       pthread_mutex_lock(&inode->i_mutex);
-
        wimlib_assert(fd->f_inode == inode);
-       wimlib_assert(inode->num_opened_fds != 0);
-       wimlib_assert(fd->idx < inode->num_allocated_fds);
-       wimlib_assert(inode->fds[fd->idx] == fd);
+       wimlib_assert(inode->i_num_opened_fds != 0);
+       wimlib_assert(fd->idx < inode->i_num_allocated_fds);
+       wimlib_assert(inode->i_fds[fd->idx] == fd);
 
-       inode->fds[fd->idx] = NULL;
+       inode->i_fds[fd->idx] = NULL;
        FREE(fd);
-       if (--inode->num_opened_fds == 0 && inode->link_count == 0) {
-               pthread_mutex_unlock(&inode->i_mutex);
-               free_inode(inode);
-       } else {
-               pthread_mutex_unlock(&inode->i_mutex);
+       if (--inode->i_num_opened_fds == 0) {
+               FREE(inode->i_fds);
+               inode->i_fds = NULL;
+               inode->i_num_allocated_fds = 0;
+               if (inode->i_nlink == 0)
+                       free_inode(inode);
        }
 }
 
-static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
+static int
+lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
 {
        wimlib_assert(fd->f_lte == lte);
 
@@ -245,9 +273,9 @@ static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
        /* Close staging file descriptor if needed. */
 
        if (lte->resource_location == RESOURCE_IN_STAGING_FILE
-            && fd->staging_fd != -1)
+            && filedes_valid(&fd->staging_fd))
        {
-               if (close(fd->staging_fd) != 0) {
+               if (filedes_close(&fd->staging_fd)) {
                        ERROR_WITH_ERRNO("Failed to close staging file");
                        return -errno;
                }
@@ -257,51 +285,96 @@ static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd)
 }
 
 /* Close a file descriptor. */
-static int close_wimlib_fd(struct wimlib_fd *fd)
+static int
+close_wimfs_fd(struct wimfs_fd *fd)
 {
        int ret;
-       DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)",
-             fd->f_inode->ino, fd->f_inode->num_opened_fds,
-             fd->f_inode->num_allocated_fds);
+       DEBUG("Closing fd (ino = %#"PRIx64", opened = %u, allocated = %u)",
+             fd->f_inode->i_ino, fd->f_inode->i_num_opened_fds,
+             fd->f_inode->i_num_allocated_fds);
        ret = lte_put_fd(fd->f_lte, fd);
-       if (ret != 0)
+       if (ret)
                return ret;
 
        inode_put_fd(fd->f_inode, fd);
        return 0;
 }
 
-static int create_dentry(struct wimfs_context *ctx, const char *path,
-                        struct dentry **dentry_ret)
+static mode_t
+fuse_mask_mode(mode_t mode, struct fuse_context *fuse_ctx)
 {
-       struct dentry *parent;
-       struct dentry *new;
+#if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
+       mode &= ~fuse_ctx->umask;
+#endif
+       return mode;
+}
+
+/*
+ * Add a new dentry with a new inode to a WIM image.
+ *
+ * Returns 0 on success, or negative error number on failure.
+ */
+static int
+create_dentry(struct fuse_context *fuse_ctx, const char *path,
+             mode_t mode, int attributes, struct wim_dentry **dentry_ret)
+{
+       struct wim_dentry *parent;
+       struct wim_dentry *new;
        const char *basename;
+       struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+       int ret;
 
-       parent = get_parent_dentry(ctx->wim, path);
+       parent = get_parent_dentry(wimfs_ctx->wim, path, WIMLIB_CASE_SENSITIVE);
        if (!parent)
-               return -ENOENT;
+               return -errno;
 
        if (!dentry_is_directory(parent))
                return -ENOTDIR;
 
        basename = path_basename(path);
-       if (get_dentry_child_with_name(parent, basename))
+       if (get_dentry_child_with_name(parent, basename, WIMLIB_CASE_SENSITIVE))
                return -EEXIST;
 
-       new = new_dentry_with_inode(basename);
-       if (!new)
+       ret = new_dentry_with_inode(basename, &new);
+       if (ret)
                return -ENOMEM;
 
-       new->d_inode->resolved = 1;
-       new->d_inode->ino = ctx->next_ino++;
+       new->d_inode->i_resolved = 1;
+       new->d_inode->i_ino = wimfs_ctx->next_ino++;
+       new->d_inode->i_attributes = attributes;
+
+       if (wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
+               if (inode_set_unix_data(new->d_inode,
+                                       fuse_ctx->uid,
+                                       fuse_ctx->gid,
+                                       fuse_mask_mode(mode, fuse_ctx),
+                                       wimfs_ctx->wim->lookup_table,
+                                       UNIX_DATA_ALL | UNIX_DATA_CREATE))
+               {
+                       free_dentry(new);
+                       return -ENOMEM;
+               }
+       }
        dentry_add_child(parent, new);
-       hlist_add_head(&new->d_inode->hlist, ctx->image_inode_list);
-       *dentry_ret = new;
+       list_add_tail(&new->d_inode->i_list, wimfs_ctx->image_inode_list);
+       if (dentry_ret)
+               *dentry_ret = new;
        return 0;
 }
 
-/* Remove a dentry; i.e. remove a reference to the corresponding inode.
+static struct wim_inode *
+wim_pathname_to_inode(WIMStruct *wim, const tchar *path)
+{
+       struct wim_dentry *dentry;
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
+       if (dentry)
+               return dentry->d_inode;
+       else
+               return NULL;
+}
+
+/* Remove a dentry from a mounted WIM image; i.e. remove an alias for the
+ * corresponding inode.
  *
  * If there are no remaining references to the inode either through dentries or
  * open file descriptors, the inode is freed.  Otherwise, the inode is not
@@ -309,78 +382,102 @@ static int create_dentry(struct wimfs_context *ctx, const char *path,
  *
  * Either way, all lookup table entries referenced by the inode have their
  * reference count decremented.  If a lookup table entry has no open file
- * descriptors and no references remaining, it is freed, and the staging file is
- * unlinked.
+ * descriptors and no references remaining, it is freed, and the corresponding
+ * staging file is unlinked.
  */
-static void remove_dentry(struct dentry *dentry,
-                         struct lookup_table *lookup_table)
+static void
+remove_dentry(struct wim_dentry *dentry,
+             struct wim_lookup_table *lookup_table)
 {
-       struct inode *inode = dentry->d_inode;
-       struct lookup_table_entry *lte;
+       struct wim_inode *inode = dentry->d_inode;
+       struct wim_lookup_table_entry *lte;
        unsigned i;
 
-       for (i = 0; i <= inode->num_ads; i++) {
+       for (i = 0; i <= inode->i_num_ads; i++) {
                lte = inode_stream_lte_resolved(inode, i);
                if (lte)
                        lte_decrement_refcnt(lte, lookup_table);
        }
        unlink_dentry(dentry);
-       put_dentry(dentry);
+       free_dentry(dentry);
 }
 
-/* Transfers file attributes from a struct inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-static int inode_to_stbuf(const struct inode *inode,
-                         struct lookup_table_entry *lte, struct stat *stbuf)
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
 {
        if (inode_is_symlink(inode))
-               stbuf->st_mode = S_IFLNK | 0777;
+               return S_IFLNK | 0777;
        else if (inode_is_directory(inode))
-               stbuf->st_mode = S_IFDIR | 0755;
+               return S_IFDIR | 0777;
        else
-               stbuf->st_mode = S_IFREG | 0755;
-
-       stbuf->st_ino   = (ino_t)inode->ino;
-       stbuf->st_nlink = inode->link_count;
-       stbuf->st_uid   = getuid();
-       stbuf->st_gid   = getgid();
-
-       if (lte) {
-               if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-                       struct stat native_stat;
-                       if (stat(lte->staging_file_name, &native_stat) != 0) {
-                               DEBUG("Failed to stat `%s': %m",
-                                     lte->staging_file_name);
-                               return -errno;
-                       }
-                       stbuf->st_size = native_stat.st_size;
-               } else {
-                       stbuf->st_size = wim_resource_size(lte);
+               return S_IFREG | 0777;
+}
+
+/* Transfers file attributes from a struct wim_inode to a `stat' buffer.
+ *
+ * The lookup table entry tells us which stream in the inode we are statting.
+ * For a named data stream, everything returned is the same as the unnamed data
+ * stream except possibly the size and block count. */
+static int
+inode_to_stbuf(const struct wim_inode *inode,
+              const struct wim_lookup_table_entry *lte,
+              struct stat *stbuf)
+{
+       const struct wimfs_context *ctx = wimfs_get_context();
+
+       memset(stbuf, 0, sizeof(struct stat));
+       stbuf->st_mode = inode_default_unix_mode(inode);
+       stbuf->st_uid = ctx->default_uid;
+       stbuf->st_gid = ctx->default_gid;
+       if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA) {
+               struct wimlib_unix_data unix_data;
+               if (inode_get_unix_data(inode, &unix_data, NULL) == 0) {
+                       stbuf->st_uid = unix_data.uid;
+                       stbuf->st_gid = unix_data.gid;
+                       stbuf->st_mode = unix_data.mode;
                }
-       } else {
-               stbuf->st_size = 0;
        }
-
-       stbuf->st_atime   = wim_timestamp_to_unix(inode->last_access_time);
-       stbuf->st_mtime   = wim_timestamp_to_unix(inode->last_write_time);
-       stbuf->st_ctime   = wim_timestamp_to_unix(inode->creation_time);
-       stbuf->st_blocks  = (stbuf->st_size + 511) / 512;
+       stbuf->st_ino = (ino_t)inode->i_ino;
+       stbuf->st_nlink = inode->i_nlink;
+       if (lte)
+               stbuf->st_size = lte->size;
+       else
+               stbuf->st_size = 0;
+#ifdef HAVE_STAT_NANOSECOND_PRECISION
+       stbuf->st_atim = wim_timestamp_to_timespec(inode->i_last_access_time);
+       stbuf->st_mtim = wim_timestamp_to_timespec(inode->i_last_write_time);
+       stbuf->st_ctim = stbuf->st_mtim;
+#else
+       stbuf->st_atime = wim_timestamp_to_unix(inode->i_last_access_time);
+       stbuf->st_mtime = wim_timestamp_to_unix(inode->i_last_write_time);
+       stbuf->st_ctime = stbuf->st_mtime;
+#endif
+       stbuf->st_blocks = (stbuf->st_size + 511) / 512;
        return 0;
 }
 
+static void
+touch_inode(struct wim_inode *inode)
+{
+       u64 now = get_wim_timestamp();
+       inode->i_last_access_time = now;
+       inode->i_last_write_time = now;
+}
+
 /* Creates a new staging file and returns its file descriptor opened for
  * writing.
  *
  * @name_ret: A location into which the a pointer to the newly allocated name of
- *                     the staging file is stored.
- * @return:  The file descriptor for the new file.  Returns -1 and sets errno on
- *             error, for any reason possible from the creat() function.
+ *           the staging file is stored.
+ *
+ * @ctx:      Context for the WIM filesystem; this provides the name of the
+ *           staging directory.
+ *
+ * On success, returns the file descriptor for the staging file, opened for
+ * writing.  On failure, returns -1 and sets errno.
  */
-static int create_staging_file(char **name_ret, int open_flags,
-                              struct wimfs_context *ctx)
+static int
+create_staging_file(char **name_ret, struct wimfs_context *ctx)
 {
        size_t name_len;
        char *name;
@@ -388,8 +485,10 @@ static int create_staging_file(char **name_ret, int open_flags,
        int fd;
        int errno_save;
 
-       name_len = ctx->staging_dir_name_len + 1 + SHA1_HASH_SIZE;
-       name = MALLOC(name_len + 1);
+       static const size_t STAGING_FILE_NAME_LEN = 20;
+
+       name_len = ctx->staging_dir_name_len + 1 + STAGING_FILE_NAME_LEN;
+       name = MALLOC(name_len + 1);
        if (!name) {
                errno = ENOMEM;
                return -1;
@@ -400,7 +499,7 @@ static int create_staging_file(char **name_ret, int open_flags,
                memcpy(name, ctx->staging_dir_name, ctx->staging_dir_name_len);
                name[ctx->staging_dir_name_len] = '/';
                randomize_char_array_with_alnum(name + ctx->staging_dir_name_len + 1,
-                                               SHA1_HASH_SIZE);
+                                               STAGING_FILE_NAME_LEN);
                name[name_len] = '\0';
 
 
@@ -408,15 +507,14 @@ static int create_staging_file(char **name_ret, int open_flags,
         * existing file, and try again if so  */
        } while (stat(name, &stbuf) == 0);
 
-       if (errno != ENOENT)
-               /* other error! */
+       if (errno != ENOENT) /* other error?! */
                return -1;
 
        /* doesn't exist--- ok */
 
        DEBUG("Creating staging file `%s'", name);
 
-       fd = open(name, open_flags | O_CREAT | O_TRUNC, 0600);
+       fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0600);
        if (fd == -1) {
                errno_save = errno;
                FREE(name);
@@ -446,20 +544,21 @@ static int create_staging_file(char **name_ret, int open_flags,
  *
  * Returns 0 on success or a negative error code on failure.
  */
-static int extract_resource_to_staging_dir(struct inode *inode,
-                                          u32 stream_id,
-                                          struct lookup_table_entry **lte,
-                                          off_t size,
-                                          struct wimfs_context *ctx)
+static int
+extract_resource_to_staging_dir(struct wim_inode *inode,
+                               u32 stream_id,
+                               struct wim_lookup_table_entry **lte,
+                               off_t size,
+                               struct wimfs_context *ctx)
 {
        char *staging_file_name;
        int ret;
        int fd;
-       struct lookup_table_entry *old_lte, *new_lte;
+       struct wim_lookup_table_entry *old_lte, *new_lte;
        off_t extract_size;
 
        DEBUG("Extracting resource to staging dir: inode %"PRIu64", "
-             "stream id %"PRIu32, inode->ino, stream_id);
+             "stream id %"PRIu32, inode->i_ino, stream_id);
 
        old_lte = *lte;
 
@@ -467,14 +566,16 @@ static int extract_resource_to_staging_dir(struct inode *inode,
                      old_lte->resource_location != RESOURCE_IN_STAGING_FILE);
 
        /* Create the staging file */
-       fd = create_staging_file(&staging_file_name, O_WRONLY, ctx);
+       fd = create_staging_file(&staging_file_name, ctx);
        if (fd == -1)
                return -errno;
 
        /* Extract the stream to the staging file (possibly truncated) */
        if (old_lte) {
-               extract_size = min(wim_resource_size(old_lte), size);
-               ret = extract_wim_resource_to_fd(old_lte, fd, extract_size);
+               struct filedes wimlib_fd;
+               filedes_init(&wimlib_fd, fd);
+               extract_size = min(old_lte->size, size);
+               ret = extract_stream_to_fd(old_lte, &wimlib_fd, extract_size);
        } else {
                ret = 0;
                extract_size = 0;
@@ -500,7 +601,7 @@ static int extract_resource_to_staging_dir(struct inode *inode,
        /* Now deal with the lookup table entries.  We may be able to re-use the
         * existing entry, but we may have to create a new one instead. */
 
-       if (old_lte && inode->link_count == old_lte->refcnt) {
+       if (old_lte && inode->i_nlink == old_lte->refcnt) {
                /* The reference count of the existing lookup table entry is the
                 * same as the link count of the inode that contains the stream
                 * we're opening.  Therefore, ALL the references to the lookup
@@ -516,10 +617,10 @@ static int extract_resource_to_staging_dir(struct inode *inode,
                         * the inode containing a stream we're opening.
                         * Therefore, we need to split the lookup table entry.
                         */
-                       wimlib_assert(old_lte->refcnt > inode->link_count);
+                       wimlib_assert(old_lte->refcnt > inode->i_nlink);
                        DEBUG("Splitting lookup table entry "
-                             "(inode->link_count = %u, old_lte->refcnt = %u)",
-                             inode->link_count, old_lte->refcnt);
+                             "(inode->i_nlink = %u, old_lte->refcnt = %u)",
+                             inode->i_nlink, old_lte->refcnt);
                }
 
                new_lte = new_lookup_table_entry();
@@ -539,19 +640,22 @@ static int extract_resource_to_staging_dir(struct inode *inode,
                 * file descriptors to the new lookup table entry.  If there's
                 * an old lookup table entry, this number needs to be subtracted
                 * from the fd's opened to the old entry. */
-               for (u16 i = 0, j = 0; j < inode->num_opened_fds; i++) {
-                       struct wimlib_fd *fd = inode->fds[i];
+               for (u16 i = 0, j = 0; j < inode->i_num_opened_fds; i++) {
+                       struct wimfs_fd *fd = inode->i_fds[i];
                        if (fd) {
                                if (fd->stream_id == stream_id) {
+                                       int raw_fd;
+
                                        wimlib_assert(fd->f_lte == old_lte);
-                                       wimlib_assert(fd->staging_fd == -1);
+                                       wimlib_assert(!filedes_valid(&fd->staging_fd));
                                        fd->f_lte = new_lte;
                                        new_lte->num_opened_fds++;
-                                       fd->staging_fd = open(staging_file_name, O_RDONLY);
-                                       if (fd->staging_fd == -1) {
+                                       raw_fd = open(staging_file_name, O_RDONLY);
+                                       if (raw_fd < 0) {
                                                ret = -errno;
                                                goto out_revert_fd_changes;
                                        }
+                                       filedes_init(&fd->staging_fd, raw_fd);
                                }
                                j++;
                        }
@@ -560,35 +664,29 @@ static int extract_resource_to_staging_dir(struct inode *inode,
                      new_lte->num_opened_fds);
                if (old_lte) {
                        old_lte->num_opened_fds -= new_lte->num_opened_fds;
-                       old_lte->refcnt -= inode->link_count;
+                       old_lte->refcnt -= inode->i_nlink;
                }
        }
 
-       new_lte->refcnt                       = inode->link_count;
-       new_lte->resource_location            = RESOURCE_IN_STAGING_FILE;
-       new_lte->staging_file_name            = staging_file_name;
-       new_lte->lte_inode                    = inode;
-       random_hash(new_lte->hash);
+       lte_put_resource(new_lte);
+       new_lte->refcnt              = inode->i_nlink;
+       new_lte->resource_location   = RESOURCE_IN_STAGING_FILE;
+       new_lte->staging_file_name   = staging_file_name;
+       new_lte->size                = size;
 
-       if (stream_id == 0)
-               inode->lte = new_lte;
-       else
-               for (u16 i = 0; i < inode->num_ads; i++)
-                       if (inode->ads_entries[i].stream_id == stream_id)
-                               inode->ads_entries[i].lte = new_lte;
-
-       lookup_table_insert(ctx->wim->lookup_table, new_lte);
-       list_add(&new_lte->staging_list, &ctx->staging_list);
+       add_unhashed_stream(new_lte, inode, stream_id,
+                           &wim_get_current_image_metadata(ctx->wim)->unhashed_streams);
+       *retrieve_lte_pointer(new_lte) = new_lte;
        *lte = new_lte;
        return 0;
 out_revert_fd_changes:
        for (u16 i = 0, j = 0; j < new_lte->num_opened_fds; i++) {
-               struct wimlib_fd *fd = inode->fds[i];
+               struct wimfs_fd *fd = inode->i_fds[i];
                if (fd && fd->stream_id == stream_id && fd->f_lte == new_lte) {
                        fd->f_lte = old_lte;
-                       if (fd->staging_fd != -1) {
-                               close(fd->staging_fd);
-                               fd->staging_fd = -1;
+                       if (filedes_valid(&fd->staging_fd)) {
+                               filedes_close(&fd->staging_fd);
+                               filedes_invalidate(&fd->staging_fd);
                        }
                        j++;
                }
@@ -604,7 +702,8 @@ out_delete_staging_file:
  * Creates a randomly named staging directory and saves its name in the
  * filesystem context structure.
  */
-static int make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
+static int
+make_staging_dir(struct wimfs_context *ctx, const char *user_prefix)
 {
        static const size_t random_suffix_len = 10;
        static const char *common_suffix = ".staging";
@@ -669,8 +768,9 @@ out:
        return ret;
 }
 
-static int remove_file_or_directory(const char *fpath, const struct stat *sb,
-                                   int typeflag, struct FTW *ftwbuf)
+static int
+remove_file_or_directory(const char *fpath, const struct stat *sb,
+                        int typeflag, struct FTW *ftwbuf)
 {
        if (remove(fpath) == 0)
                return 0;
@@ -683,7 +783,8 @@ static int remove_file_or_directory(const char *fpath, const struct stat *sb,
 /*
  * Deletes the staging directory and all the files contained in it.
  */
-static int delete_staging_dir(struct wimfs_context *ctx)
+static int
+delete_staging_dir(struct wimfs_context *ctx)
 {
        int ret;
        ret = nftw(ctx->staging_dir_name, remove_file_or_directory,
@@ -693,70 +794,15 @@ static int delete_staging_dir(struct wimfs_context *ctx)
        return ret;
 }
 
-static void inode_update_lte_ptr(struct inode *inode,
-                                struct lookup_table_entry *old_lte,
-                                struct lookup_table_entry *new_lte)
+static int
+inode_close_fds(struct wim_inode *inode)
 {
-       if (inode->lte == old_lte) {
-               inode->lte = new_lte;
-       } else {
-               for (unsigned i = 0; i < inode->num_ads; i++) {
-                       if (inode->ads_entries[i].lte == old_lte) {
-                               inode->ads_entries[i].lte = new_lte;
-                               break;
-                       }
-               }
-       }
-}
-
-static int update_lte_of_staging_file(struct lookup_table_entry *lte,
-                                     struct lookup_table *table)
-{
-       struct lookup_table_entry *duplicate_lte;
-       int ret;
-       u8 hash[SHA1_HASH_SIZE];
-       struct stat stbuf;
-
-       ret = sha1sum(lte->staging_file_name, hash);
-       if (ret != 0)
-               return ret;
-       lookup_table_unlink(table, lte);
-       duplicate_lte = __lookup_resource(table, hash);
-       if (duplicate_lte) {
-               /* Merge duplicate lookup table entries */
-               duplicate_lte->refcnt += lte->refcnt;
-               inode_update_lte_ptr(lte->lte_inode, lte, duplicate_lte);
-               free_lookup_table_entry(lte);
-       } else {
-               if (stat(lte->staging_file_name, &stbuf) != 0) {
-                       ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name);
-                       return WIMLIB_ERR_STAT;
-               }
-               if (stbuf.st_size == 0) {
-                       /* Zero-length stream.  No lookup table entry needed. */
-                       inode_update_lte_ptr(lte->lte_inode, lte, NULL);
-                       free_lookup_table_entry(lte);
-               } else {
-                       wimlib_assert(&lte->file_on_disk == &lte->staging_file_name);
-                       lte->resource_entry.original_size = stbuf.st_size;
-                       lte->resource_entry.size = stbuf.st_size;
-                       lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
-                       lte->file_on_disk_fp = NULL;
-                       copy_hash(lte->hash, hash);
-                       lookup_table_insert(table, lte);
-               }
-       }
-       return 0;
-}
-
-static int inode_close_fds(struct inode *inode)
-{
-       u16 num_opened_fds = inode->num_opened_fds;
+       u16 num_opened_fds = inode->i_num_opened_fds;
        for (u16 i = 0, j = 0; j < num_opened_fds; i++) {
-               struct wimlib_fd *fd = inode->fds[i];
+               struct wimfs_fd *fd = inode->i_fds[i];
                if (fd) {
                        wimlib_assert(fd->f_inode == inode);
-                       int ret = close_wimlib_fd(fd);
+                       int ret = close_wimfs_fd(fd);
                        if (ret != 0)
                                return ret;
                        j++;
@@ -766,38 +812,44 @@ static int inode_close_fds(struct inode *inode)
 }
 
 /* Overwrites the WIM file, with changes saved. */
-static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
-                      wimlib_progress_func_t progress_func)
+static int
+rebuild_wim(struct wimfs_context *ctx, int write_flags,
+           wimlib_progress_func_t progress_func)
 {
        int ret;
-       struct lookup_table_entry *lte, *tmp;
-       WIMStruct *w = ctx->wim;
+       struct wim_lookup_table_entry *lte, *tmp;
+       WIMStruct *wim = ctx->wim;
+       struct wim_image_metadata *imd = wim_get_current_image_metadata(ctx->wim);
 
        DEBUG("Closing all staging file descriptors.");
-       list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) {
-               ret = inode_close_fds(lte->lte_inode);
-               if (ret != 0)
+       image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+               ret = inode_close_fds(lte->back_inode);
+               if (ret)
                        return ret;
        }
 
-       DEBUG("Calculating SHA1 checksums for all new staging files.");
-       list_for_each_entry(lte, &ctx->staging_list, staging_list) {
-               ret = update_lte_of_staging_file(lte, w->lookup_table);
-               if (ret != 0)
-                       return ret;
+       DEBUG("Freeing entries for zero-length streams");
+       image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+               wimlib_assert(lte->unhashed);
+               if (lte->size == 0) {
+                       struct wim_lookup_table_entry **back_ptr;
+                       back_ptr = retrieve_lte_pointer(lte);
+                       *back_ptr = NULL;
+                       list_del(&lte->unhashed_list);
+                       free_lookup_table_entry(lte);
+               }
        }
 
-       xml_update_image_info(w, w->current_image);
-       ret = wimlib_overwrite(w, write_flags, 0, progress_func);
-       if (ret != 0)
+       xml_update_image_info(wim, wim->current_image);
+       ret = wimlib_overwrite(wim, write_flags, 0, progress_func);
+       if (ret)
                ERROR("Failed to commit changes to mounted WIM image");
        return ret;
 }
 
-
-
 /* Simple function that returns the concatenation of 2 strings. */
-static char *strcat_dup(const char *s1, const char *s2, size_t max_len)
+static char *
+strcat_dup(const char *s1, const char *s2, size_t max_len)
 {
        size_t len = strlen(s1) + strlen(s2);
        if (len > max_len)
@@ -809,8 +861,8 @@ static char *strcat_dup(const char *s1, const char *s2, size_t max_len)
        return p;
 }
 
-static int set_message_queue_names(struct wimfs_context *ctx,
-                                  const char *mount_dir)
+static int
+set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir)
 {
        static const char *u2d_prefix = "/wimlib-unmount-to-daemon-mq";
        static const char *d2u_prefix = "/wimlib-daemon-to-unmount-mq";
@@ -818,7 +870,7 @@ static int set_message_queue_names(struct wimfs_context *ctx,
        char *p;
        int ret;
 
-       dir_path = realpath(mount_dir, NULL);
+       dir_path = realpath(mount_dir, NULL);
        if (!dir_path) {
                ERROR_WITH_ERRNO("Failed to resolve path \"%s\"", mount_dir);
                if (errno == ENOMEM)
@@ -827,12 +879,9 @@ static int set_message_queue_names(struct wimfs_context *ctx,
                        return WIMLIB_ERR_NOTDIR;
        }
 
-       p = dir_path;
-       while (*p) {
+       for (p = dir_path; *p; p++)
                if (*p == '/')
                        *p = 0xff;
-               p++;
-       }
 
        ctx->unmount_to_daemon_mq_name = strcat_dup(u2d_prefix, dir_path,
                                                    NAME_MAX);
@@ -857,7 +906,8 @@ out_free_dir_path:
        return ret;
 }
 
-static void free_message_queue_names(struct wimfs_context *ctx)
+static void
+free_message_queue_names(struct wimfs_context *ctx)
 {
        FREE(ctx->unmount_to_daemon_mq_name);
        FREE(ctx->daemon_to_unmount_mq_name);
@@ -874,41 +924,56 @@ static void free_message_queue_names(struct wimfs_context *ctx)
  * @daemon specifies whether the calling process is the filesystem daemon or the
  * unmount process.
  */
-static int open_message_queues(struct wimfs_context *ctx, bool daemon)
+static int
+open_message_queues(struct wimfs_context *ctx, bool daemon)
 {
        int unmount_to_daemon_mq_flags = O_WRONLY | O_CREAT;
        int daemon_to_unmount_mq_flags = O_RDONLY | O_CREAT;
+       mode_t mode;
+       mode_t orig_umask;
+       int ret;
 
-       if (daemon)
+       if (daemon) {
                swap(unmount_to_daemon_mq_flags, daemon_to_unmount_mq_flags);
+               mode = 0600;
+       } else {
+               mode = 0666;
+       }
 
+       orig_umask = umask(0000);
        DEBUG("Opening message queue \"%s\"", ctx->unmount_to_daemon_mq_name);
        ctx->unmount_to_daemon_mq = mq_open(ctx->unmount_to_daemon_mq_name,
-                                           unmount_to_daemon_mq_flags, 0700, NULL);
+                                           unmount_to_daemon_mq_flags, mode, NULL);
 
        if (ctx->unmount_to_daemon_mq == (mqd_t)-1) {
                ERROR_WITH_ERRNO("mq_open()");
-               return WIMLIB_ERR_MQUEUE;
+               ret = WIMLIB_ERR_MQUEUE;
+               goto out;
        }
 
        DEBUG("Opening message queue \"%s\"", ctx->daemon_to_unmount_mq_name);
        ctx->daemon_to_unmount_mq = mq_open(ctx->daemon_to_unmount_mq_name,
-                                           daemon_to_unmount_mq_flags, 0700, NULL);
+                                           daemon_to_unmount_mq_flags, mode, NULL);
 
        if (ctx->daemon_to_unmount_mq == (mqd_t)-1) {
                ERROR_WITH_ERRNO("mq_open()");
                mq_close(ctx->unmount_to_daemon_mq);
                mq_unlink(ctx->unmount_to_daemon_mq_name);
                ctx->unmount_to_daemon_mq = (mqd_t)-1;
-               return WIMLIB_ERR_MQUEUE;
+               ret = WIMLIB_ERR_MQUEUE;
+               goto out;
        }
-       return 0;
+       ret = 0;
+out:
+       umask(orig_umask);
+       return ret;
 }
 
 /* Try to determine the maximum message size of a message queue.  The return
  * value is the maximum message size, or a guess of 8192 bytes if it cannot be
  * determined. */
-static long mq_get_msgsize(mqd_t mq)
+static long
+mq_get_msgsize(mqd_t mq)
 {
        static const char *msgsize_max_file = "/proc/sys/fs/mqueue/msgsize_max";
        FILE *fp;
@@ -937,11 +1002,12 @@ static long mq_get_msgsize(mqd_t mq)
        return msgsize;
 }
 
-static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
-                      void **mailbox_ret)
+static int
+get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
+           void **mailbox_ret)
 {
        long msgsize;
-       char *mailbox;
+       void *mailbox;
 
        msgsize = mq_get_msgsize(mq);
 
@@ -961,14 +1027,16 @@ static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret,
        return 0;
 }
 
-static void unlink_message_queues(struct wimfs_context *ctx)
+static void
+unlink_message_queues(struct wimfs_context *ctx)
 {
        mq_unlink(ctx->unmount_to_daemon_mq_name);
        mq_unlink(ctx->daemon_to_unmount_mq_name);
 }
 
 /* Closes the message queues, which are allocated in static variables */
-static void close_message_queues(struct wimfs_context *ctx)
+static void
+close_message_queues(struct wimfs_context *ctx)
 {
        DEBUG("Closing message queues");
        mq_close(ctx->unmount_to_daemon_mq);
@@ -984,29 +1052,29 @@ struct unmount_msg_hdr {
        u32 cur_version;
        u32 msg_type;
        u32 msg_size;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_request {
        struct unmount_msg_hdr hdr;
        u32 unmount_flags;
        u8 want_progress_messages;
-} PACKED;
+} _packed_attribute;
 
 struct msg_daemon_info {
        struct unmount_msg_hdr hdr;
        pid_t daemon_pid;
        u32 mount_flags;
-} PACKED;
+} _packed_attribute;
 
 struct msg_unmount_finished {
        struct unmount_msg_hdr hdr;
-       int32_t status;
-} PACKED;
+       s32 status;
+} _packed_attribute;
 
 struct msg_write_streams_progress {
        struct unmount_msg_hdr hdr;
        union wimlib_progress_info info;
-} PACKED;
+} _packed_attribute;
 
 enum {
        MSG_TYPE_UNMOUNT_REQUEST,
@@ -1016,28 +1084,30 @@ enum {
        MSG_TYPE_MAX,
 };
 
-struct msg_handler_context {
+struct msg_handler_context_hdr {
        int timeout_seconds;
-       union {
-               struct {
-                       pid_t daemon_pid;
-                       int mount_flags;
-                       int status;
-                       wimlib_progress_func_t progress_func;
-               } unmount;
-               struct {
-                       struct wimfs_context *wimfs_ctx;
-               } daemon;
-       };
 };
 
-static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
-                                   u8 want_progress_messages)
+struct unmount_msg_handler_context {
+       struct msg_handler_context_hdr hdr;
+       pid_t daemon_pid;
+       int mount_flags;
+       int status;
+       wimlib_progress_func_t progress_func;
+};
+
+struct daemon_msg_handler_context {
+       struct msg_handler_context_hdr hdr;
+       struct wimfs_context *wimfs_ctx;
+};
+
+static int
+send_unmount_request_msg(mqd_t mq, int unmount_flags, u8 want_progress_messages)
 {
        DEBUG("Sending unmount request msg");
        struct msg_unmount_request msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type    = MSG_TYPE_UNMOUNT_REQUEST,
                        .msg_size    = sizeof(msg),
@@ -1053,14 +1123,15 @@ static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
        return 0;
 }
 
-static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
+static int
+send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
 {
        DEBUG("Sending daemon info msg (pid = %d, mount_flags=%x)",
              pid, mount_flags);
 
        struct msg_daemon_info msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type = MSG_TYPE_DAEMON_INFO,
                        .msg_size = sizeof(msg),
@@ -1075,12 +1146,13 @@ static int send_daemon_info_msg(mqd_t mq, pid_t pid, int mount_flags)
        return 0;
 }
 
-static void send_unmount_finished_msg(mqd_t mq, int status)
+static void
+send_unmount_finished_msg(mqd_t mq, int status)
 {
        DEBUG("Sending unmount finished msg");
        struct msg_unmount_finished msg = {
                .hdr = {
-                       .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                       .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                        .cur_version = WIMLIB_VERSION_CODE,
                        .msg_type = MSG_TYPE_UNMOUNT_FINISHED,
                        .msg_size = sizeof(msg),
@@ -1091,13 +1163,14 @@ static void send_unmount_finished_msg(mqd_t mq, int status)
                ERROR_WITH_ERRNO("Failed to send status to unmount process");
 }
 
-static int unmount_progress_func(enum wimlib_progress_msg msg,
-                                const union wimlib_progress_info *info)
+static int
+unmount_progress_func(enum wimlib_progress_msg msg,
+                     const union wimlib_progress_info *info)
 {
        if (msg == WIMLIB_PROGRESS_MSG_WRITE_STREAMS) {
                struct msg_write_streams_progress msg = {
                        .hdr = {
-                               .min_version = WIMLIB_MAKEVERSION(1, 2, 0),
+                               .min_version = WIMLIB_MAKEVERSION(1, 2, 1),
                                .cur_version = WIMLIB_VERSION_CODE,
                                .msg_type = MSG_TYPE_WRITE_STREAMS_PROGRESS,
                                .msg_size = sizeof(msg),
@@ -1107,16 +1180,18 @@ static int unmount_progress_func(enum wimlib_progress_msg msg,
                if (mq_send(wimfs_get_context()->daemon_to_unmount_mq,
                            (void*)&msg, sizeof(msg), 1))
                {
-                       ERROR_WITH_ERRNO("Failed to send status to unmount process");
+                       ERROR_WITH_ERRNO("Failed to send progress information "
+                                        "to unmount process");
                }
        }
        return 0;
 }
 
-static int msg_unmount_request_handler(const void *_msg,
-                                      struct msg_handler_context *handler_ctx)
+static int
+msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 {
-       const struct msg_unmount_request *msg;
+       const struct msg_unmount_request *msg = _msg;
+       struct daemon_msg_handler_context *handler_ctx = _handler_ctx;
        struct wimfs_context *wimfs_ctx;
        int status = 0;
        int ret;
@@ -1125,9 +1200,7 @@ static int msg_unmount_request_handler(const void *_msg,
 
        DEBUG("Handling unmount request msg");
 
-       msg = _msg;
-       wimfs_ctx = handler_ctx->daemon.wimfs_ctx;
-
+       wimfs_ctx = handler_ctx->wimfs_ctx;
        if (msg->hdr.msg_size < sizeof(*msg)) {
                status = WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
                goto out;
@@ -1172,83 +1245,88 @@ out:
                                status = ret;
                }
        }
-       send_unmount_finished_msg(wimfs_ctx->daemon_to_unmount_mq, status);
+       wimfs_ctx->status = status;
+       wimfs_ctx->have_status = true;
        return MSG_BREAK_LOOP;
 }
 
-static int msg_daemon_info_handler(const void *_msg,
-                                  struct msg_handler_context *handler_ctx)
+static int
+msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
 {
        const struct msg_daemon_info *msg = _msg;
+       struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+
        DEBUG("Handling daemon info msg");
        if (msg->hdr.msg_size < sizeof(*msg))
                return WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
-       handler_ctx->unmount.daemon_pid = msg->daemon_pid;
-       handler_ctx->unmount.mount_flags = msg->mount_flags;
-       handler_ctx->timeout_seconds = 1;
+       handler_ctx->daemon_pid = msg->daemon_pid;
+       handler_ctx->mount_flags = msg->mount_flags;
+       handler_ctx->hdr.timeout_seconds = 1;
        DEBUG("pid of daemon is %d; mount flags were %#x",
-             handler_ctx->unmount.daemon_pid,
-             handler_ctx->unmount.mount_flags);
+             handler_ctx->daemon_pid,
+             handler_ctx->mount_flags);
        return 0;
 }
 
-static int msg_write_streams_progress_handler(const void *_msg,
-                                             struct msg_handler_context *handler_ctx)
+static int
+msg_write_streams_progress_handler(const void *_msg, void *_handler_ctx)
 {
        const struct msg_write_streams_progress *msg = _msg;
+       struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+
        if (msg->hdr.msg_size < sizeof(*msg))
                return WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
-       if (handler_ctx->unmount.progress_func) {
-               handler_ctx->unmount.progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
-                                                  &msg->info);
+       if (handler_ctx->progress_func) {
+               handler_ctx->progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS,
+                                          &msg->info);
        }
        return 0;
 }
 
-static int msg_unmount_finished_handler(const void *_msg,
-                                       struct msg_handler_context *handler_ctx)
+static int
+msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 {
        const struct msg_unmount_finished *msg = _msg;
+       struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+
        DEBUG("Handling unmount finished message");
        if (msg->hdr.msg_size < sizeof(*msg))
                return WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE;
-       handler_ctx->unmount.status = msg->status;
-       DEBUG("status is %d", handler_ctx->unmount.status);
+       handler_ctx->status = msg->status;
+       DEBUG("status is %d", handler_ctx->status);
        return MSG_BREAK_LOOP;
 }
 
-static int unmount_timed_out_cb(struct msg_handler_context *handler_ctx)
+static int
+unmount_timed_out_cb(void *_handler_ctx)
 {
-       if (handler_ctx->unmount.daemon_pid == 0) {
-               goto out_crashed;
-       } else {
-               kill(handler_ctx->unmount.daemon_pid, 0);
-               if (errno == ESRCH) {
-                       goto out_crashed;
-               } else {
-                       DEBUG("Filesystem daemon is still alive... "
-                             "Waiting another %d seconds\n",
-                             handler_ctx->timeout_seconds);
-                       return 0;
-               }
+       const struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
+
+       if (handler_ctx->daemon_pid == 0 ||
+           (kill(handler_ctx->daemon_pid, 0) != 0 && errno == ESRCH))
+       {
+               ERROR("The filesystem daemon has crashed!  Changes to the "
+                     "WIM may not have been commited.");
+               return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
        }
-out_crashed:
-       ERROR("The filesystem daemon has crashed!  Changes to the "
-             "WIM may not have been commited.");
-       return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
+
+       DEBUG("Filesystem daemon is still alive... "
+             "Waiting another %d seconds", handler_ctx->hdr.timeout_seconds);
+       return 0;
 }
 
-static int daemon_timed_out_cb(struct msg_handler_context *handler_ctx)
+static int
+daemon_timed_out_cb(void *_handler_ctx)
 {
-       DEBUG("Timed out");
+       ERROR("Timed out waiting for unmount request! "
+             "Changes to the mounted WIM will not be committed.");
        return WIMLIB_ERR_TIMEOUT;
 }
 
-typedef int (*msg_handler_t)(const void *_msg,
-                            struct msg_handler_context *handler_ctx);
+typedef int (*msg_handler_t)(const void *_msg, void *_handler_ctx);
 
 struct msg_handler_callbacks {
-       int (*timed_out)(struct msg_handler_context *);
+       int (*timed_out)(void * _handler_ctx);
        msg_handler_t msg_handlers[MSG_TYPE_MAX];
 };
 
@@ -1268,9 +1346,11 @@ static const struct msg_handler_callbacks daemon_msg_handler_callbacks = {
        },
 };
 
-static int receive_message(mqd_t mq, struct msg_handler_context *handler_ctx,
-                          const msg_handler_t msg_handlers[],
-                          long mailbox_size, void *mailbox)
+static int
+receive_message(mqd_t mq,
+               struct msg_handler_context_hdr *handler_ctx,
+               const msg_handler_t msg_handlers[],
+               long mailbox_size, void *mailbox)
 {
        struct timeval now;
        struct timespec timeout;
@@ -1312,9 +1392,10 @@ static int receive_message(mqd_t mq, struct msg_handler_context *handler_ctx,
        return ret;
 }
 
-static int message_loop(mqd_t mq,
-                       const struct msg_handler_callbacks *callbacks,
-                       struct msg_handler_context *handler_ctx)
+static int
+message_loop(mqd_t mq,
+            const struct msg_handler_callbacks *callbacks,
+            struct msg_handler_context_hdr *handler_ctx)
 {
        static const size_t MAX_MSG_SIZE = 512;
        long msgsize;
@@ -1362,7 +1443,8 @@ static int message_loop(mqd_t mq,
  *  not.  However, after that, the unmount process must wait for the filesystem
  *  daemon to finish writing the WIM file.
  */
-static int execute_fusermount(const char *dir)
+static int
+execute_fusermount(const char *dir, bool lazy)
 {
        pid_t pid;
        int ret;
@@ -1375,150 +1457,176 @@ static int execute_fusermount(const char *dir)
        }
        if (pid == 0) {
                /* Child */
-               execlp("fusermount", "fusermount", "-u", dir, NULL);
+               char *argv[10];
+               char **argp = argv;
+               *argp++ = "fusermount";
+               if (lazy)
+                       *argp++ = "-z";
+               *argp++ = "-u";
+               *argp++ = (char*)dir;
+               *argp = NULL;
+               execvp("fusermount", argv);
                ERROR_WITH_ERRNO("Failed to execute `fusermount'");
                exit(WIMLIB_ERR_FUSERMOUNT);
        }
 
        /* Parent */
-       ret = wait(&status);
+       ret = waitpid(pid, &status, 0);
        if (ret == -1) {
                ERROR_WITH_ERRNO("Failed to wait for fusermount process to "
                                 "terminate");
                return WIMLIB_ERR_FUSERMOUNT;
        }
 
-       if (status != 0) {
-               if (status == WIMLIB_ERR_FUSERMOUNT)
-                       ERROR("Could not find the `fusermount' program");
-               else
-                       ERROR("fusermount exited with status %d", status);
+       if (!WIFEXITED(status)) {
+               ERROR("'fusermount' did not terminate normally!");
+               return WIMLIB_ERR_FUSERMOUNT;
+       }
 
-               /* Try again, but with the `umount' program.  This is required
-                * on other FUSE implementations such as FreeBSD's that do not
-                * have a `fusermount' program. */
+       status = WEXITSTATUS(status);
 
-               pid = fork();
-               if (pid == -1) {
-                       ERROR_WITH_ERRNO("Failed to fork()");
-                       return WIMLIB_ERR_FORK;
-               }
-               if (pid == 0) {
-                       /* Child */
-                       execlp("umount", "umount", dir, NULL);
-                       ERROR_WITH_ERRNO("Failed to execute `umount'");
-                       exit(WIMLIB_ERR_FUSERMOUNT);
-               }
+       if (status == 0)
+               return 0;
 
-               /* Parent */
-               ret = wait(&status);
-               if (ret == -1) {
-                       ERROR_WITH_ERRNO("Failed to wait for `umount' process to "
-                                        "terminate");
-                       return WIMLIB_ERR_FUSERMOUNT;
-               }
-               if (status != 0) {
-                       ERROR("`umount' exited with failure status");
-                       return WIMLIB_ERR_FUSERMOUNT;
-               }
+       if (status != WIMLIB_ERR_FUSERMOUNT)
+               return WIMLIB_ERR_FUSERMOUNT;
+
+       /* Try again, but with the `umount' program.  This is required on other
+        * FUSE implementations such as FreeBSD's that do not have a
+        * `fusermount' program. */
+       ERROR("Falling back to 'umount'.  Note: you may need to be "
+             "root for this to work");
+       pid = fork();
+       if (pid == -1) {
+               ERROR_WITH_ERRNO("Failed to fork()");
+               return WIMLIB_ERR_FORK;
+       }
+       if (pid == 0) {
+               /* Child */
+               char *argv[10];
+               char **argp = argv;
+               *argp++ = "umount";
+               if (lazy)
+                       *argp++ = "-l";
+               *argp++ = (char*)dir;
+               *argp = NULL;
+               execvp("umount", argv);
+               ERROR_WITH_ERRNO("Failed to execute `umount'");
+               exit(WIMLIB_ERR_FUSERMOUNT);
+       }
+
+       /* Parent */
+       ret = waitpid(pid, &status, 0);
+       if (ret == -1) {
+               ERROR_WITH_ERRNO("Failed to wait for `umount' process to "
+                                "terminate");
+               return WIMLIB_ERR_FUSERMOUNT;
+       }
+
+       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+               ERROR("`umount' did not successfully complete");
+               return WIMLIB_ERR_FUSERMOUNT;
        }
-       return 0;
-}
 
-static int wimfs_access(const char *path, int mask)
-{
-       /* Permissions not implemented */
        return 0;
 }
 
-static int wimfs_chmod(const char *path, mode_t mask)
+static int
+wimfs_chmod(const char *path, mode_t mask)
 {
-       struct dentry *dentry;
+       struct wim_dentry *dentry;
        struct wimfs_context *ctx = wimfs_get_context();
-       struct inode *inode;
-       struct stat stbuf;
        int ret;
 
-       ret = lookup_resource(ctx->wim, path,
-                             get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
-                             &dentry, NULL, NULL);
-       if (ret != 0)
-               return ret;
-       inode = dentry->d_inode;
-       inode_to_stbuf(inode, NULL, &stbuf);
-       if (mask == stbuf.st_mode)
-               return 0;
-       else
+       if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
                return -EPERM;
-}
 
-/* Called when the filesystem is unmounted. */
-static void wimfs_destroy(void *p)
-{
-       struct wimfs_context *wimfs_ctx;
+       ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, NULL, NULL);
+       if (ret)
+               return ret;
 
-       wimfs_ctx = wimfs_get_context();
+       ret = inode_set_unix_data(dentry->d_inode, ctx->default_uid,
+                                 ctx->default_gid, mask,
+                                 ctx->wim->lookup_table, UNIX_DATA_MODE);
+       return ret ? -ENOMEM : 0;
+}
 
-       if (open_message_queues(wimfs_ctx, true))
-               return;
+static int
+wimfs_chown(const char *path, uid_t uid, gid_t gid)
+{
+       struct wim_dentry *dentry;
+       struct wimfs_context *ctx = wimfs_get_context();
+       int ret;
 
-       struct msg_handler_context handler_ctx = {
-               .timeout_seconds = 5,
-               .daemon = {
-                       .wimfs_ctx = wimfs_ctx,
-               },
-       };
+       if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA))
+               return -EPERM;
 
-       message_loop(wimfs_ctx->unmount_to_daemon_mq,
-                    &daemon_msg_handler_callbacks,
-                    &handler_ctx);
+       ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, NULL, NULL);
+       if (ret)
+               return ret;
 
-       close_message_queues(wimfs_ctx);
+       ret = inode_set_unix_data(dentry->d_inode, uid, gid,
+                                 inode_default_unix_mode(dentry->d_inode),
+                                 ctx->wim->lookup_table,
+                                 UNIX_DATA_UID | UNIX_DATA_GID);
+       return ret ? -ENOMEM : 0;
 }
 
-#if 0
-static int wimfs_fallocate(const char *path, int mode,
-                          off_t offset, off_t len, struct fuse_file_info *fi)
+/* Called when the filesystem is unmounted. */
+static void
+wimfs_destroy(void *p)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
-       wimlib_assert(fd->staging_fd != -1);
-       return fallocate(fd->staging_fd, mode, offset, len);
+       struct wimfs_context *wimfs_ctx = wimfs_get_context();
+       if (open_message_queues(wimfs_ctx, true) == 0) {
+               struct daemon_msg_handler_context handler_ctx = {
+                       .hdr = {
+                               .timeout_seconds = 5,
+                       },
+                       .wimfs_ctx = wimfs_ctx,
+               };
+               message_loop(wimfs_ctx->unmount_to_daemon_mq,
+                            &daemon_msg_handler_callbacks,
+                            &handler_ctx.hdr);
+       }
 }
 
-#endif
-
-static int wimfs_fgetattr(const char *path, struct stat *stbuf,
-                         struct fuse_file_info *fi)
+static int
+wimfs_fgetattr(const char *path, struct stat *stbuf,
+              struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
        return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf);
 }
 
-static int wimfs_ftruncate(const char *path, off_t size,
-                          struct fuse_file_info *fi)
+static int
+wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
-       int ret = ftruncate(fd->staging_fd, size);
-       if (ret != 0)
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
+       int ret = ftruncate(fd->staging_fd.fd, size);
+       if (ret)
                return -errno;
-       if (fd->f_lte && size < fd->f_lte->resource_entry.original_size)
-               fd->f_lte->resource_entry.original_size = size;
+       touch_inode(fd->f_inode);
+       fd->f_lte->size = size;
        return 0;
 }
 
 /*
  * Fills in a `struct stat' that corresponds to a file or directory in the WIM.
  */
-static int wimfs_getattr(const char *path, struct stat *stbuf)
+static int
+wimfs_getattr(const char *path, struct stat *stbuf)
 {
-       struct dentry *dentry;
-       struct lookup_table_entry *lte;
+       struct wim_dentry *dentry;
+       struct wim_lookup_table_entry *lte;
        int ret;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path,
-                             get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK,
-                             &dentry, &lte, NULL);
+       ret = wim_pathname_to_stream(ctx->wim, path,
+                                    get_lookup_flags(ctx) |
+                                       LOOKUP_FLAG_DIRECTORY_OK,
+                                    &dentry, &lte, NULL);
        if (ret != 0)
                return ret;
        return inode_to_stbuf(dentry->d_inode, lte, stbuf);
@@ -1526,103 +1634,103 @@ static int wimfs_getattr(const char *path, struct stat *stbuf)
 
 #ifdef ENABLE_XATTR
 /* Read an alternate data stream through the XATTR interface, or get its size */
-static int wimfs_getxattr(const char *path, const char *name, char *value,
-                         size_t size)
+static int
+wimfs_getxattr(const char *path, const char *name, char *value,
+              size_t size)
 {
        int ret;
-       struct inode *inode;
-       struct ads_entry *ads_entry;
-       size_t res_size;
-       struct lookup_table_entry *lte;
+       struct wim_inode *inode;
+       struct wim_ads_entry *ads_entry;
+       u64 stream_size;
+       struct wim_lookup_table_entry *lte;
        struct wimfs_context *ctx = wimfs_get_context();
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
        inode = wim_pathname_to_inode(ctx->wim, path);
        if (!inode)
-               return -ENOENT;
+               return -errno;
 
        ads_entry = inode_get_ads_entry(inode, name, NULL);
        if (!ads_entry)
                return -ENOATTR;
 
        lte = ads_entry->lte;
-       res_size = wim_resource_size(lte);
+       stream_size = lte->size;
 
        if (size == 0)
-               return res_size;
+               return stream_size;
 
-       if (res_size > size)
+       if (stream_size > size)
                return -ERANGE;
 
-       ret = read_full_wim_resource(lte, (u8*)value,
-                                    WIMLIB_RESOURCE_FLAG_MULTITHREADED);
-       if (ret != 0)
-               return -EIO;
-
-       return res_size;
+       ret = read_full_stream_into_buf(lte, value);
+       if (ret) {
+               if (errno)
+                       return -errno;
+               else
+                       return -EIO;
+       }
+       return stream_size;
 }
 #endif
 
 /* Create a hard link */
-static int wimfs_link(const char *to, const char *from)
+static int
+wimfs_link(const char *to, const char *from)
 {
-       struct dentry *from_dentry, *from_dentry_parent;
+       struct wim_dentry *from_dentry, *from_dentry_parent;
        const char *link_name;
-       struct inode *inode;
-       struct lookup_table_entry *lte;
-       WIMStruct *w = wimfs_get_WIMStruct();
-       u16 i;
+       struct wim_inode *inode;
+       WIMStruct *wim = wimfs_get_WIMStruct();
+       int ret;
 
-       inode = wim_pathname_to_inode(w, to);
+       inode = wim_pathname_to_inode(wim, to);
        if (!inode)
-               return -ENOENT;
-
-       if (inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT)
-               return -EEXIST;
+               return -errno;
 
-       if (inode->attributes & FILE_ATTRIBUTE_DIRECTORY)
+       if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+                                  FILE_ATTRIBUTE_REPARSE_POINT))
                return -EPERM;
 
-       from_dentry_parent = get_parent_dentry(w, from);
+       from_dentry_parent = get_parent_dentry(wim, from, WIMLIB_CASE_SENSITIVE);
        if (!from_dentry_parent)
-               return -ENOENT;
+               return -errno;
        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))
+       if (get_dentry_child_with_name(from_dentry_parent, link_name,
+                                      WIMLIB_CASE_SENSITIVE))
                return -EEXIST;
-       from_dentry = new_dentry(link_name);
-       if (!from_dentry)
+
+       ret = new_dentry(link_name, &from_dentry);
+       if (ret)
                return -ENOMEM;
 
-       inode_add_dentry(from_dentry, inode);
+       inode->i_nlink++;
+       inode_ref_streams(inode);
        from_dentry->d_inode = inode;
-       inode->link_count++;
-
-       for (i = 0; i <= inode->num_ads; i++) {
-               lte = inode_stream_lte_resolved(inode, i);
-               if (lte)
-                       lte->refcnt++;
-       }
+       inode_add_dentry(from_dentry, inode);
        dentry_add_child(from_dentry_parent, from_dentry);
        return 0;
 }
 
 #ifdef ENABLE_XATTR
-static int wimfs_listxattr(const char *path, char *list, size_t size)
+static int
+wimfs_listxattr(const char *path, char *list, size_t size)
 {
        size_t needed_size;
-       struct inode *inode;
+       struct wim_inode *inode;
        struct wimfs_context *ctx = wimfs_get_context();
        u16 i;
        char *p;
+       bool size_only = (size == 0);
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
@@ -1631,63 +1739,75 @@ static int wimfs_listxattr(const char *path, char *list, size_t size)
 
        inode = wim_pathname_to_inode(ctx->wim, path);
        if (!inode)
-               return -ENOENT;
+               return -errno;
 
-       if (size == 0) {
-               needed_size = 0;
-               for (i = 0; i < inode->num_ads; i++)
-                       needed_size += inode->ads_entries[i].stream_name_utf8_len + 6;
-               return needed_size;
-       } else {
-               p = list;
-               for (i = 0; i < inode->num_ads; i++) {
-                       needed_size = inode->ads_entries[i].stream_name_utf8_len + 6;
-                       if (needed_size > size)
+       p = list;
+       for (i = 0; i < inode->i_num_ads; i++) {
+
+               if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+                       continue;
+
+               char *stream_name_mbs;
+               size_t stream_name_mbs_nbytes;
+               int ret;
+
+               ret = utf16le_to_tstr(inode->i_ads_entries[i].stream_name,
+                                     inode->i_ads_entries[i].stream_name_nbytes,
+                                     &stream_name_mbs,
+                                     &stream_name_mbs_nbytes);
+               if (ret)
+                       return -errno;
+
+               needed_size = stream_name_mbs_nbytes + 6;
+               if (!size_only) {
+                       if (needed_size > size) {
+                               FREE(stream_name_mbs);
                                return -ERANGE;
-                       p += sprintf(p, "user.%s",
-                                    inode->ads_entries[i].stream_name_utf8) + 1;
+                       }
+                       sprintf(p, "user.%s", stream_name_mbs);
                        size -= needed_size;
                }
-               return p - list;
+               p += needed_size;
+               FREE(stream_name_mbs);
        }
+       return p - list;
 }
 #endif
 
 
-/* Create a directory in the WIM.
- * @mode is currently ignored.  */
-static int wimfs_mkdir(const char *path, mode_t mode)
+/* Create a directory in the WIM image. */
+static int
+wimfs_mkdir(const char *path, mode_t mode)
 {
-       struct dentry *dentry;
-       int ret;
-
-       ret = create_dentry(wimfs_get_context(), path, &dentry);
-       if (ret == 0)
-               dentry->d_inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
-       return ret;
+       return create_dentry(fuse_get_context(), path, mode | S_IFDIR,
+                            FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
-/* Create a regular file in the WIM.
- * @mode is currently ignored.  */
-static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
+/* Create a regular file or alternate data stream in the WIM image. */
+static int
+wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 {
        const char *stream_name;
-       struct wimfs_context *ctx = wimfs_get_context();
-       if ((ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
+       struct fuse_context *fuse_ctx = fuse_get_context();
+       struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+
+       if (!S_ISREG(mode))
+               return -EPERM;
+
+       if ((wimfs_ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
             && (stream_name = path_stream_name(path))) {
                /* Make an alternate data stream */
-               struct ads_entry *new_entry;
-               struct inode *inode;
+               struct wim_ads_entry *new_entry;
+               struct wim_inode *inode;
 
                char *p = (char*)stream_name - 1;
                wimlib_assert(*p == ':');
                *p = '\0';
 
-               inode = wim_pathname_to_inode(ctx->wim, path);
+               inode = wim_pathname_to_inode(wimfs_ctx->wim, path);
                if (!inode)
-                       return -ENOENT;
-               if (inode->attributes &
-                   (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
+                       return -errno;
+               if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
                        return -ENOENT;
                if (inode_get_ads_entry(inode, stream_name, NULL))
                        return -EEXIST;
@@ -1696,41 +1816,40 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                        return -ENOMEM;
                return 0;
        } else {
-               struct dentry *dentry;
-               int ret;
-
                /* Make a normal file (not an alternate data stream) */
-               ret = create_dentry(ctx, path, &dentry);
-               if (ret == 0)
-                       dentry->d_inode->attributes = FILE_ATTRIBUTE_NORMAL;
-               return ret;
+               return create_dentry(fuse_ctx, path, mode | S_IFREG,
+                                    FILE_ATTRIBUTE_NORMAL, NULL);
        }
 }
 
-
 /* Open a file.  */
-static int wimfs_open(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_open(const char *path, struct fuse_file_info *fi)
 {
-       struct dentry *dentry;
-       struct lookup_table_entry *lte;
+       struct wim_dentry *dentry;
+       struct wim_lookup_table_entry *lte;
        int ret;
-       struct wimlib_fd *fd;
-       struct inode *inode;
+       struct wimfs_fd *fd;
+       struct wim_inode *inode;
        u16 stream_idx;
        u32 stream_id;
        struct wimfs_context *ctx = wimfs_get_context();
+       struct wim_lookup_table_entry **back_ptr;
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
-       if (ret != 0)
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
+       if (ret)
                return ret;
 
        inode = dentry->d_inode;
 
-       if (stream_idx == 0)
+       if (stream_idx == 0) {
                stream_id = 0;
-       else
-               stream_id = inode->ads_entries[stream_idx - 1].stream_id;
+               back_ptr = &inode->i_lte;
+       } else {
+               stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+               back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+       }
 
        /* The file resource may be in the staging directory (read-write mounts
         * only) or in the WIM.  If it's in the staging directory, we need to
@@ -1741,45 +1860,49 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 
        if (flags_writable(fi->flags) &&
             (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) {
-               u64 size = (lte) ? wim_resource_size(lte) : 0;
+               u64 size = (lte) ? lte->size : 0;
                ret = extract_resource_to_staging_dir(inode, stream_id,
                                                      &lte, size, ctx);
-               if (ret != 0)
+               if (ret)
                        return ret;
+               *back_ptr = lte;
        }
 
-       ret = alloc_wimlib_fd(inode, stream_id, lte, &fd,
-                             wimfs_ctx_readonly(ctx));
-       if (ret != 0)
+       ret = alloc_wimfs_fd(inode, stream_id, lte, &fd);
+       if (ret)
                return ret;
 
        if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-               fd->staging_fd = open(lte->staging_file_name, fi->flags);
-               if (fd->staging_fd == -1) {
+               int raw_fd;
+
+               raw_fd = open(lte->staging_file_name, fi->flags);
+               if (raw_fd < 0) {
                        int errno_save = errno;
-                       close_wimlib_fd(fd);
+                       close_wimfs_fd(fd);
                        return -errno_save;
                }
+               filedes_init(&fd->staging_fd, raw_fd);
        }
        fi->fh = (uintptr_t)fd;
        return 0;
 }
 
 /* Opens a directory. */
-static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_opendir(const char *path, struct fuse_file_info *fi)
 {
-       struct inode *inode;
+       struct wim_inode *inode;
        int ret;
-       struct wimlib_fd *fd = NULL;
+       struct wimfs_fd *fd = NULL;
        struct wimfs_context *ctx = wimfs_get_context();
-       WIMStruct *w = ctx->wim;
+       WIMStruct *wim = ctx->wim;
 
-       inode = wim_pathname_to_inode(w, path);
+       inode = wim_pathname_to_inode(wim, path);
        if (!inode)
-               return -ENOENT;
+               return -errno;
        if (!inode_is_directory(inode))
                return -ENOTDIR;
-       ret = alloc_wimlib_fd(inode, 0, NULL, &fd, wimfs_ctx_readonly(ctx));
+       ret = alloc_wimfs_fd(inode, 0, NULL, &fd);
        fi->fh = (uintptr_t)fd;
        return ret;
 }
@@ -1788,44 +1911,55 @@ static int wimfs_opendir(const char *path, struct fuse_file_info *fi)
 /*
  * Read data from a file in the WIM or in the staging directory.
  */
-static int wimfs_read(const char *path, char *buf, size_t size,
-                     off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_read(const char *path, char *buf, size_t size,
+          off_t offset, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
        ssize_t ret;
+       u64 stream_size;
 
        if (!fd)
                return -EBADF;
 
-       if (!fd->f_lte) /* Empty stream with no lookup table entry */
+       if (size == 0)
                return 0;
 
-       if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-               /* Read from staging file */
+       if (fd->f_lte)
+               stream_size = fd->f_lte->size;
+       else
+               stream_size = 0;
 
-               wimlib_assert(fd->f_lte->staging_file_name);
-               wimlib_assert(fd->staging_fd != -1);
+       if (offset > stream_size)
+               return -EOVERFLOW;
 
-               DEBUG("Seek to offset %zu", offset);
+       size = min(size, stream_size - offset);
+       if (size == 0)
+               return 0;
 
-               if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
-                       return -errno;
-               ret = read(fd->staging_fd, buf, size);
+       switch (fd->f_lte->resource_location) {
+       case RESOURCE_IN_STAGING_FILE:
+               ret = raw_pread(&fd->staging_fd, buf, size, offset);
                if (ret == -1)
-                       return -errno;
-               return ret;
-       } else {
-               /* Read from WIM */
-               u64 res_size = wim_resource_size(fd->f_lte);
-               if (offset > res_size)
-                       return -EOVERFLOW;
-               size = min(size, res_size - offset);
-               if (read_wim_resource(fd->f_lte, (u8*)buf,
-                                     size, offset,
-                                     WIMLIB_RESOURCE_FLAG_MULTITHREADED) != 0)
-                       return -EIO;
-               return size;
+                       ret = -errno;
+               break;
+       case RESOURCE_IN_WIM:
+               if (read_partial_wim_stream_into_buf(fd->f_lte, size,
+                                                    offset, buf))
+                       ret = errno ? -errno : -EIO;
+               else
+                       ret = size;
+               break;
+       case RESOURCE_IN_ATTACHED_BUFFER:
+               memcpy(buf, fd->f_lte->attached_buffer + offset, size);
+               ret = size;
+               break;
+       default:
+               ERROR("Invalid resource location");
+               ret = -EIO;
+               break;
        }
+       return ret;
 }
 
 struct fill_params {
@@ -1833,20 +1967,35 @@ struct fill_params {
        fuse_fill_dir_t filler;
 };
 
-static int dentry_fuse_fill(struct dentry *dentry, void *arg)
+static int
+dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
 {
        struct fill_params *fill_params = arg;
-       return fill_params->filler(fill_params->buf, dentry->file_name_utf8,
-                                  NULL, 0);
+
+       char *file_name_mbs;
+       size_t file_name_mbs_nbytes;
+       int ret;
+
+       ret = utf16le_to_tstr(dentry->file_name,
+                             dentry->file_name_nbytes,
+                             &file_name_mbs,
+                             &file_name_mbs_nbytes);
+       if (ret)
+               return -errno;
+
+       ret = fill_params->filler(fill_params->buf, file_name_mbs, NULL, 0);
+       FREE(file_name_mbs);
+       return ret;
 }
 
 /* Fills in the entries of the directory specified by @path using the
  * FUSE-provided function @filler.  */
-static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
-                        off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+             off_t offset, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
-       struct inode *inode;
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
+       struct wim_inode *inode;
 
        if (!fd)
                return -EBADF;
@@ -1861,48 +2010,57 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
        filler(buf, ".", NULL, 0);
        filler(buf, "..", NULL, 0);
 
-       return for_dentry_in_rbtree(inode->children.rb_node,
+       return for_dentry_in_rbtree(inode->i_children.rb_node,
                                    dentry_fuse_fill, &fill_params);
 }
 
 
-static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
+static int
+wimfs_readlink(const char *path, char *buf, size_t buf_len)
 {
        struct wimfs_context *ctx = wimfs_get_context();
-       struct inode *inode = wim_pathname_to_inode(ctx->wim, path);
+       struct wim_inode *inode = wim_pathname_to_inode(ctx->wim, path);
        int ret;
        if (!inode)
-               return -ENOENT;
+               return -errno;
        if (!inode_is_symlink(inode))
                return -EINVAL;
-
-       ret = inode_readlink(inode, buf, buf_len, ctx->wim,
-                            WIMLIB_RESOURCE_FLAG_MULTITHREADED);
-       if (ret > 0)
+       if (buf_len == 0)
+               return -EINVAL;
+       ret = wim_inode_readlink(inode, buf, buf_len - 1, NULL);
+       if (ret >= 0) {
+               wimlib_assert(ret <= buf_len - 1);
+               buf[ret] = '\0';
                ret = 0;
+       } else if (ret == -ENAMETOOLONG) {
+               buf[buf_len - 1] = '\0';
+       }
        return ret;
 }
 
 /* Close a file. */
-static int wimfs_release(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_release(const char *path, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
-       return close_wimlib_fd(fd);
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
+       return close_wimfs_fd(fd);
 }
 
 /* Close a directory */
-static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
+static int
+wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
-       return close_wimlib_fd(fd);
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
+       return close_wimfs_fd(fd);
 }
 
 #ifdef ENABLE_XATTR
 /* Remove an alternate data stream through the XATTR interface */
-static int wimfs_removexattr(const char *path, const char *name)
+static int
+wimfs_removexattr(const char *path, const char *name)
 {
-       struct inode *inode;
-       struct ads_entry *ads_entry;
+       struct wim_inode *inode;
+       struct wim_ads_entry *ads_entry;
        u16 ads_idx;
        struct wimfs_context *ctx = wimfs_get_context();
 
@@ -1915,7 +2073,7 @@ static int wimfs_removexattr(const char *path, const char *name)
 
        inode = wim_pathname_to_inode(ctx->wim, path);
        if (!inode)
-               return -ENOENT;
+               return -errno;
 
        ads_entry = inode_get_ads_entry(inode, name, &ads_idx);
        if (!ads_entry)
@@ -1926,175 +2084,98 @@ static int wimfs_removexattr(const char *path, const char *name)
 #endif
 
 /* 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;
-       WIMStruct *w = wimfs_get_WIMStruct();
-       int ret;
-
-       /* This rename() implementation currently only supports actual files
-        * (not alternate data streams) */
-
-       src = get_dentry(w, from);
-       if (!src)
-               return -ENOENT;
-
-       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) {
-               /* Destination file exists */
-
-               if (src == dst) /* Same file */
-                       return 0;
-
-               if (!dentry_is_directory(src)) {
-                       /* Cannot rename non-directory to directory. */
-                       if (dentry_is_directory(dst))
-                               return -EISDIR;
-               } else {
-                       /* Cannot rename directory to a non-directory or a non-empty
-                        * directory */
-                       if (!dentry_is_directory(dst))
-                               return -ENOTDIR;
-                       if (inode_has_children(dst->d_inode))
-                               return -ENOTEMPTY;
-               }
-               parent_of_dst = dst->parent;
-               remove_dentry(dst, w->lookup_table);
-       } else {
-               /* Destination does not exist */
-               parent_of_dst = get_parent_dentry(w, to);
-               if (!parent_of_dst)
-                       return -ENOENT;
-
-               if (!dentry_is_directory(parent_of_dst))
-                       return -ENOTDIR;
-       }
-
-       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);
-       dentry_add_child(parent_of_dst, src);
-       return 0;
+static int
+wimfs_rename(const char *from, const char *to)
+{
+       return rename_wim_path(wimfs_get_WIMStruct(), from, to,
+                              WIMLIB_CASE_SENSITIVE);
 }
 
 /* Remove a directory */
-static int wimfs_rmdir(const char *path)
+static int
+wimfs_rmdir(const char *path)
 {
-       struct dentry *dentry;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       struct wim_dentry *dentry;
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
-               return -ENOENT;
+               return -errno;
+
+       if (!dentry_is_directory(dentry))
+               return -ENOTDIR;
 
-       if (!dentry_is_empty_directory(dentry))
+       if (dentry_has_children(dentry))
                return -ENOTEMPTY;
 
-       remove_dentry(dentry, w->lookup_table);
+       remove_dentry(dentry, wim->lookup_table);
        return 0;
 }
 
 #ifdef ENABLE_XATTR
 /* Write an alternate data stream through the XATTR interface */
-static int wimfs_setxattr(const char *path, const char *name,
-                         const char *value, size_t size, int flags)
-{
-       struct ads_entry *existing_ads_entry;
-       struct ads_entry *new_ads_entry;
-       struct lookup_table_entry *existing_lte;
-       struct lookup_table_entry *lte;
-       struct inode *inode;
-       u8 value_hash[SHA1_HASH_SIZE];
+static int
+wimfs_setxattr(const char *path, const char *name,
+              const char *value, size_t size, int flags)
+{
+       struct wim_ads_entry *existing_ads_entry;
+       struct wim_inode *inode;
        u16 ads_idx;
        struct wimfs_context *ctx = wimfs_get_context();
+       int ret;
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)
                return -ENOATTR;
        name += 5;
 
        inode = wim_pathname_to_inode(ctx->wim, path);
        if (!inode)
-               return -ENOENT;
+               return -errno;
 
        existing_ads_entry = inode_get_ads_entry(inode, name, &ads_idx);
        if (existing_ads_entry) {
                if (flags & XATTR_CREATE)
                        return -EEXIST;
-               inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
        } else {
                if (flags & XATTR_REPLACE)
                        return -ENOATTR;
        }
-       new_ads_entry = inode_add_ads(inode, name);
-       if (!new_ads_entry)
-               return -ENOMEM;
-
-       sha1_buffer((const u8*)value, size, value_hash);
 
-       existing_lte = __lookup_resource(ctx->wim->lookup_table, value_hash);
-
-       if (existing_lte) {
-               lte = existing_lte;
-               lte->refcnt++;
+       ret = inode_add_ads_with_data(inode, name, value,
+                                     size, ctx->wim->lookup_table);
+       if (ret == 0) {
+               if (existing_ads_entry)
+                       inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table);
        } else {
-               u8 *value_copy;
-               lte = new_lookup_table_entry();
-               if (!lte)
-                       return -ENOMEM;
-               value_copy = MALLOC(size);
-               if (!value_copy) {
-                       FREE(lte);
-                       return -ENOMEM;
-               }
-               memcpy(value_copy, value, size);
-               lte->resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
-               lte->attached_buffer              = value_copy;
-               lte->resource_entry.original_size = size;
-               lte->resource_entry.size          = size;
-               lte->resource_entry.flags         = 0;
-               copy_hash(lte->hash, value_hash);
-               lookup_table_insert(ctx->wim->lookup_table, lte);
-       }
-       new_ads_entry->lte = lte;
-       return 0;
+               ret = -ENOMEM;
+       }
+       return ret;
 }
 #endif
 
-static int wimfs_symlink(const char *to, const char *from)
+static int
+wimfs_symlink(const char *to, const char *from)
 {
-       struct wimfs_context *ctx = wimfs_get_context();
-       struct dentry *dentry;
+       struct fuse_context *fuse_ctx = fuse_get_context();
+       struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
+       struct wim_dentry *dentry;
        int ret;
 
-       ret = create_dentry(ctx, from, &dentry);
+       ret = create_dentry(fuse_ctx, from, S_IFLNK | 0777,
+                           FILE_ATTRIBUTE_REPARSE_POINT, &dentry);
        if (ret == 0) {
-               dentry->d_inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
-               dentry->d_inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-               if (inode_set_symlink(dentry->d_inode, to,
-                                     ctx->wim->lookup_table, NULL))
-               {
-                       unlink_dentry(dentry);
-                       free_dentry(dentry);
-                       ret = -ENOMEM;
+               dentry->d_inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+               ret = wim_inode_set_symlink(dentry->d_inode, to,
+                                           wimfs_ctx->wim->lookup_table);
+               if (ret) {
+                       remove_dentry(dentry, wimfs_ctx->wim->lookup_table);
+                       if (ret == WIMLIB_ERR_NOMEM)
+                               ret = -ENOMEM;
+                       else
+                               ret = -EIO;
                }
        }
        return ret;
@@ -2102,18 +2183,19 @@ static int wimfs_symlink(const char *to, const char *from)
 
 
 /* Reduce the size of a file */
-static int wimfs_truncate(const char *path, off_t size)
+static int
+wimfs_truncate(const char *path, off_t size)
 {
-       struct dentry *dentry;
-       struct lookup_table_entry *lte;
+       struct wim_dentry *dentry;
+       struct wim_lookup_table_entry *lte;
        int ret;
        u16 stream_idx;
        u32 stream_id;
-       struct inode *inode;
+       struct wim_inode *inode;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
@@ -2121,41 +2203,49 @@ static int wimfs_truncate(const char *path, off_t size)
        if (lte == NULL && size == 0)
                return 0;
 
-       inode = dentry->d_inode;
-       if (stream_idx == 0)
-               stream_id = 0;
-       else
-               stream_id = inode->ads_entries[stream_idx - 1].stream_id;
-
-       if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+       if (lte != NULL && lte->resource_location == RESOURCE_IN_STAGING_FILE) {
                ret = truncate(lte->staging_file_name, size);
-               if (ret != 0)
+               if (ret)
                        ret = -errno;
+               else
+                       lte->size = size;
        } else {
                /* File in WIM.  Extract it to the staging directory, but only
                 * the first @size bytes of it. */
+               struct wim_lookup_table_entry **back_ptr;
+
+               inode = dentry->d_inode;
+               if (stream_idx == 0) {
+                       stream_id = 0;
+                       back_ptr = &inode->i_lte;
+               } else {
+                       stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
+                       back_ptr = &inode->i_ads_entries[stream_idx - 1].lte;
+               }
                ret = extract_resource_to_staging_dir(inode, stream_id,
                                                      &lte, size, ctx);
+               *back_ptr = lte;
        }
        return ret;
 }
 
 /* Unlink a non-directory or alternate data stream */
-static int wimfs_unlink(const char *path)
+static int
+wimfs_unlink(const char *path)
 {
-       struct dentry *dentry;
-       struct lookup_table_entry *lte;
+       struct wim_dentry *dentry;
+       struct wim_lookup_table_entry *lte;
        int ret;
        u16 stream_idx;
        struct wimfs_context *ctx = wimfs_get_context();
 
-       ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx),
-                             &dentry, &lte, &stream_idx);
+       ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx),
+                                    &dentry, &lte, &stream_idx);
 
        if (ret != 0)
                return ret;
 
-       if (stream_idx == 0)
+       if (inode_stream_name_nbytes(dentry->d_inode, stream_idx) == 0)
                remove_dentry(dentry, ctx->wim->lookup_table);
        else
                inode_remove_ads(dentry->d_inode, stream_idx - 1,
@@ -2169,89 +2259,90 @@ static int wimfs_unlink(const char *path)
  *
  * Note that alternate data streams do not have their own timestamps.
  */
-static int wimfs_utimens(const char *path, const struct timespec tv[2])
+static int
+wimfs_utimens(const char *path, const struct timespec tv[2])
 {
-       struct dentry *dentry;
-       struct inode *inode;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       struct wim_dentry *dentry;
+       struct wim_inode *inode;
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
-               return -ENOENT;
+               return -errno;
        inode = dentry->d_inode;
 
        if (tv[0].tv_nsec != UTIME_OMIT) {
                if (tv[0].tv_nsec == UTIME_NOW)
-                       inode->last_access_time = get_wim_timestamp();
+                       inode->i_last_access_time = get_wim_timestamp();
                else
-                       inode->last_access_time = timespec_to_wim_timestamp(&tv[0]);
+                       inode->i_last_access_time = timespec_to_wim_timestamp(tv[0]);
        }
        if (tv[1].tv_nsec != UTIME_OMIT) {
                if (tv[1].tv_nsec == UTIME_NOW)
-                       inode->last_write_time = get_wim_timestamp();
+                       inode->i_last_write_time = get_wim_timestamp();
                else
-                       inode->last_write_time = timespec_to_wim_timestamp(&tv[1]);
+                       inode->i_last_write_time = timespec_to_wim_timestamp(tv[1]);
        }
        return 0;
 }
-#else
-static int wimfs_utime(const char *path, struct utimbuf *times)
+#else /* HAVE_UTIMENSAT */
+static int
+wimfs_utime(const char *path, struct utimbuf *times)
 {
-       struct dentry *dentry;
-       struct inode *inode;
-       WIMStruct *w = wimfs_get_WIMStruct();
+       struct wim_dentry *dentry;
+       struct wim_inode *inode;
+       WIMStruct *wim = wimfs_get_WIMStruct();
 
-       dentry = get_dentry(w, path);
+       dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
        if (!dentry)
-               return -ENOENT;
+               return -errno;
        inode = dentry->d_inode;
 
-       inode->last_write_time = unix_timestamp_to_wim(times->modtime);
-       inode->last_access_time = unix_timestamp_to_wim(times->actime);
+       inode->i_last_write_time = unix_timestamp_to_wim(times->modtime);
+       inode->i_last_access_time = unix_timestamp_to_wim(times->actime);
        return 0;
 }
-#endif
+#endif /* !HAVE_UTIMENSAT */
 
 /* Writes to a file in the WIM filesystem.
  * It may be an alternate data stream, but here we don't even notice because we
  * just get a lookup table entry. */
-static int wimfs_write(const char *path, const char *buf, size_t size,
-                      off_t offset, struct fuse_file_info *fi)
+static int
+wimfs_write(const char *path, const char *buf, size_t size,
+           off_t offset, struct fuse_file_info *fi)
 {
-       struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh;
+       struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
        int ret;
-       u64 now;
 
        if (!fd)
                return -EBADF;
 
-       wimlib_assert(fd->f_lte);
-       wimlib_assert(fd->f_lte->staging_file_name);
-       wimlib_assert(fd->staging_fd != -1);
-       wimlib_assert(fd->f_inode);
-
-       /* Seek to the requested position */
-       if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
-               return -errno;
+       wimlib_assert(fd->f_lte != NULL);
+       wimlib_assert(fd->f_lte->staging_file_name != NULL);
+       wimlib_assert(filedes_valid(&fd->staging_fd));
+       wimlib_assert(fd->f_inode != NULL);
 
        /* Write the data. */
-       ret = write(fd->staging_fd, buf, size);
+       ret = raw_pwrite(&fd->staging_fd, buf, size, offset);
        if (ret == -1)
                return -errno;
 
-       now = get_wim_timestamp();
-       fd->f_inode->last_write_time = now;
-       fd->f_inode->last_access_time = now;
+       /* Update file size */
+       if (offset + size > fd->f_lte->size) {
+               DEBUG("Update file size %"PRIu64 " => %"PRIu64"",
+                     fd->f_lte->size, offset + size);
+               fd->f_lte->size = offset + size;
+       }
+
+       /* Update timestamps */
+       touch_inode(fd->f_inode);
        return ret;
 }
 
 static struct fuse_operations wimfs_operations = {
-       .access      = wimfs_access,
        .chmod       = wimfs_chmod,
+       .chown       = wimfs_chown,
        .destroy     = wimfs_destroy,
-#if 0
-       .fallocate   = wimfs_fallocate,
-#endif
        .fgetattr    = wimfs_fgetattr,
        .ftruncate   = wimfs_ftruncate,
        .getattr     = wimfs_getattr,
@@ -2289,6 +2380,9 @@ static struct fuse_operations wimfs_operations = {
 #endif
        .write       = wimfs_write,
 
+       /* wimfs keeps file descriptor structures (struct wimfs_fd), so there is
+        * no need to have the file path provided on operations such as read()
+        * where only the file descriptor is needed. */
 #if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
        .flag_nullpath_ok = 1,
 #endif
@@ -2299,21 +2393,18 @@ static struct fuse_operations wimfs_operations = {
 };
 
 
-/* Mounts an image from a WIM file. */
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
-                                int mount_flags, WIMStruct **additional_swms,
-                                unsigned num_additional_swms,
-                                const char *staging_dir)
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
+                  int mount_flags, const char *staging_dir)
 {
-       int argc = 0;
+       int argc;
        char *argv[16];
        int ret;
        char *dir_copy;
-       struct lookup_table *joined_tab, *wim_tab_save;
-       struct image_metadata *imd;
+       struct wim_image_metadata *imd;
        struct wimfs_context ctx;
-       struct hlist_node *cur_node;
-       struct inode *inode;
+       struct wim_inode *inode;
 
        DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ",
              wim, image, dir, mount_flags);
@@ -2321,102 +2412,88 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        if (!wim || !dir)
                return WIMLIB_ERR_INVALID_PARAM;
 
-       ret = verify_swm_set(wim, additional_swms, num_additional_swms);
-       if (ret != 0)
-               return ret;
-
-       if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
-               ERROR("Cannot mount a split WIM read-write");
-               return WIMLIB_ERR_SPLIT_UNSUPPORTED;
-       }
-
-       if (num_additional_swms) {
-               ret = new_joined_lookup_table(wim, additional_swms,
-                                             num_additional_swms,
-                                             &joined_tab);
-               if (ret != 0)
-                       return ret;
-               wim_tab_save = wim->lookup_table;
-               wim->lookup_table = joined_tab;
-       }
+       if (mount_flags & ~(WIMLIB_MOUNT_FLAG_READWRITE |
+                           WIMLIB_MOUNT_FLAG_DEBUG |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
+                           WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS |
+                           WIMLIB_MOUNT_FLAG_UNIX_DATA |
+                           WIMLIB_MOUNT_FLAG_ALLOW_OTHER))
+               return WIMLIB_ERR_INVALID_PARAM;
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-               ret = wim_run_full_verifications(wim);
-               if (ret != 0)
-                       goto out;
+               ret = can_delete_from_wim(wim);
+               if (ret)
+                       return ret;
        }
 
        ret = select_wim_image(wim, image);
-       if (ret != 0)
-               goto out;
+       if (ret)
+               return ret;
 
        DEBUG("Selected image %d", image);
 
        imd = wim_get_current_image_metadata(wim);
 
-       if (imd->root_dentry->refcnt != 1) {
-               ERROR("Cannot mount image that was just exported with "
-                     "wimlib_export_image()");
-               ret = WIMLIB_ERR_INVALID_PARAM;
-               goto out;
-       }
-
        if (imd->modified) {
-               ERROR("Cannot mount image that was added "
-                     "with wimlib_add_image()");
-               ret = WIMLIB_ERR_INVALID_PARAM;
-               goto out;
+               /* wimfs_read() only supports a limited number of stream
+                * locations, not including RESOURCE_IN_FILE_ON_DISK,
+                * RESOURCE_IN_NTFS_VOLUME, etc. that might appear if files were
+                * added to the WIM image.  */
+               ERROR("Cannot mount an image with newly added files!");
+               return WIMLIB_ERR_INVALID_PARAM;
        }
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-               ret = lock_wim(wim, wim->fp);
-               if (ret != 0)
-                       goto out;
+               ret = lock_wim(wim, wim->in_fd.fd);
+               if (ret)
+                       return ret;
        }
 
+       /* Use default stream interface if one was not specified */
        if (!(mount_flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |
                       WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR |
                       WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)))
                mount_flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR;
 
-
        DEBUG("Initializing struct wimfs_context");
        init_wimfs_context(&ctx);
        ctx.wim = wim;
        ctx.mount_flags = mount_flags;
        ctx.image_inode_list = &imd->inode_list;
-
+       ctx.default_uid = getuid();
+       ctx.default_gid = getgid();
+       wimlib_assert(list_empty(&imd->unhashed_streams));
        if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
                ctx.default_lookup_flags = LOOKUP_FLAG_ADS_OK;
 
        DEBUG("Unlinking message queues in case they already exist");
        ret = set_message_queue_names(&ctx, dir);
-       if (ret != 0)
+       if (ret)
                goto out_unlock;
        unlink_message_queues(&ctx);
 
        DEBUG("Preparing arguments to fuse_main()");
 
        dir_copy = STRDUP(dir);
-       if (!dir_copy)
+       if (!dir_copy) {
+               ret = WIMLIB_ERR_NOMEM;
                goto out_free_message_queue_names;
+       }
 
-       argv[argc++] = "imagex";
+       argc = 0;
+       argv[argc++] = "wimlib";
        argv[argc++] = dir_copy;
 
-       /* disable multi-threaded operation for read-write mounts */
-       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
-               argv[argc++] = "-s";
+       /* disable multi-threaded operation */
+       argv[argc++] = "-s";
 
        if (mount_flags & WIMLIB_MOUNT_FLAG_DEBUG)
                argv[argc++] = "-d";
 
        /*
-        * We provide the use_ino option because we are going to assign inode
-        * numbers oursides.  The inodes will be given unique numbers in the
-        * assign_inode_numbers() function, and the static variable @next_ino is
-        * set to the next available inode number.
-        */
+        * We provide the use_ino option to the FUSE mount because we are going
+        * to assign inode numbers ourselves. */
        char optstring[256] =
                "use_ino"
                ",subtype=wimfs"
@@ -2424,18 +2501,21 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 #if FUSE_MAJOR_VERSION > 2 || (FUSE_MAJOR_VERSION == 2 && FUSE_MINOR_VERSION >= 8)
                ",hard_remove"
 #endif
+               ",default_permissions"
                ;
        argv[argc++] = "-o";
        argv[argc++] = optstring;
        if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
                /* Read-write mount.  Make the staging directory */
                ret = make_staging_dir(&ctx, staging_dir);
-               if (ret != 0)
+               if (ret)
                        goto out_free_dir_copy;
        } else {
                /* Read-only mount */
                strcat(optstring, ",ro");
        }
+       if (mount_flags & WIMLIB_MOUNT_FLAG_ALLOW_OTHER)
+               strcat(optstring, ",allow_other");
        argv[argc] = NULL;
 
 #ifdef ENABLE_DEBUG
@@ -2452,21 +2532,15 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 #endif
 
        /* Mark dentry tree as modified if read-write mount. */
-       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
                imd->modified = 1;
-               imd->has_been_mounted_rw = 1;
-       }
 
        /* Resolve the lookup table entries for every inode in the image, and
         * assign inode numbers */
        DEBUG("Resolving lookup table entries and assigning inode numbers");
-
        ctx.next_ino = 1;
-       hlist_for_each_entry(inode, cur_node, &imd->inode_list, hlist) {
-               inode_resolve_ltes(inode, wim->lookup_table);
-               inode->ino = ctx.next_ino++;
-       }
-       /*ctx.next_ino = assign_inode_numbers(&imd->inode_list);*/
+       image_for_each_inode(inode, imd)
+               inode->i_ino = ctx.next_ino++;
        DEBUG("(next_ino = %"PRIu64")", ctx.next_ino);
 
        DEBUG("Calling fuse_main()");
@@ -2474,32 +2548,48 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        ret = fuse_main(argc, argv, &wimfs_operations, &ctx);
 
        DEBUG("Returned from fuse_main() (ret = %d)", ret);
-       if (ret)
+
+       if (ret) {
                ret = WIMLIB_ERR_FUSE;
+       } else {
+               if (ctx.have_status)
+                       ret = ctx.status;
+               else
+                       ret = WIMLIB_ERR_TIMEOUT;
+       }
+       if (ctx.daemon_to_unmount_mq != (mqd_t)(-1)) {
+               send_unmount_finished_msg(ctx.daemon_to_unmount_mq, ret);
+               close_message_queues(&ctx);
+       }
+
+       /* Try to delete the staging directory if a deletion wasn't yet
+        * attempted due to an earlier error */
+       if (ctx.staging_dir_name)
+               delete_staging_dir(&ctx);
 out_free_dir_copy:
        FREE(dir_copy);
 out_unlock:
        wim->wim_locked = 0;
 out_free_message_queue_names:
        free_message_queue_names(&ctx);
-out:
-       if (num_additional_swms) {
-               free_lookup_table(wim->lookup_table);
-               wim->lookup_table = wim_tab_save;
-       }
        return ret;
 }
 
-/*
- * Unmounts the WIM file that was previously mounted on @dir by using
- * wimlib_mount_image().
- */
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
-                                  wimlib_progress_func_t progress_func)
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_unmount_image(const char *dir, int unmount_flags,
+                    wimlib_progress_func_t progress_func)
 {
        int ret;
        struct wimfs_context wimfs_ctx;
 
+       if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
+                             WIMLIB_UNMOUNT_FLAG_COMMIT |
+                             WIMLIB_UNMOUNT_FLAG_REBUILD |
+                             WIMLIB_UNMOUNT_FLAG_RECOMPRESS |
+                             WIMLIB_UNMOUNT_FLAG_LAZY))
+               return WIMLIB_ERR_INVALID_PARAM;
+
        init_wimfs_context(&wimfs_ctx);
 
        ret = set_message_queue_names(&wimfs_ctx, dir);
@@ -2516,23 +2606,23 @@ WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
        if (ret != 0)
                goto out_close_message_queues;
 
-       ret = execute_fusermount(dir);
+       ret = execute_fusermount(dir, (unmount_flags & WIMLIB_UNMOUNT_FLAG_LAZY) != 0);
        if (ret != 0)
                goto out_close_message_queues;
 
-       struct msg_handler_context handler_ctx = {
-               .timeout_seconds = 5,
-               .unmount = {
-                       .daemon_pid = 0,
-                       .progress_func = progress_func,
+       struct unmount_msg_handler_context handler_ctx = {
+               .hdr = {
+                       .timeout_seconds = 5,
                },
+               .daemon_pid = 0,
+               .progress_func = progress_func,
        };
 
        ret = message_loop(wimfs_ctx.daemon_to_unmount_mq,
                           &unmount_msg_handler_callbacks,
-                          &handler_ctx);
+                          &handler_ctx.hdr);
        if (ret == 0)
-               ret = handler_ctx.unmount.status;
+               ret = handler_ctx.status;
 out_close_message_queues:
        close_message_queues(&wimfs_ctx);
 out_free_message_queue_names:
@@ -2544,25 +2634,30 @@ out:
 #else /* WITH_FUSE */
 
 
-static inline int mount_unsupported_error()
+static int
+mount_unsupported_error(void)
 {
+#if defined(__WIN32__)
+       ERROR("Sorry-- Mounting WIM images is not supported on Windows!");
+#else
        ERROR("wimlib was compiled with --without-fuse, which disables support "
              "for mounting WIMs.");
+#endif
        return WIMLIB_ERR_UNSUPPORTED;
 }
 
-WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags,
-                                  wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_unmount_image(const tchar *dir, int unmount_flags,
+                    wimlib_progress_func_t progress_func)
 {
        return mount_unsupported_error();
 }
 
-WIMLIBAPI int wimlib_mount_image(WIMStruct *wim_p, int image, const char *dir,
-                                int mount_flags, WIMStruct **additional_swms,
-                                unsigned num_additional_swms,
-                                const char *staging_dir)
+WIMLIBAPI int
+wimlib_mount_image(WIMStruct *wim, int image, const tchar *dir,
+                  int mount_flags, const tchar *staging_dir)
 {
        return mount_unsupported_error();
 }
 
-#endif /* WITH_FUSE */
+#endif /* !WITH_FUSE */