X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=a2e09b435e43a60a72db289e0839c747315ceeaa;hp=417d98777fd2e1a0d49029918850f62116e2e33f;hb=394c5bd3292c0f3168416c0a5f25989e557b3cfc;hpb=9e56d04309e3e6a896319225288f0c86bd36d34e

diff --git a/src/mount_image.c b/src/mount_image.c
index 417d9877..a2e09b43 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -30,24 +30,32 @@
 
 #ifdef WITH_FUSE
 
-#include "sha1.h"
-#include "lookup_table.h"
-#include "xml.h"
+#ifdef __WIN32__
+#  error "FUSE mount not supported on Win32!  Please configure --without-fuse"
+#endif
+
 #include "buffer_io.h"
+#include "lookup_table.h"
+#include "sha1.h"
 #include "timestamp.h"
+#include "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>
@@ -90,11 +98,8 @@ struct wimfs_context {
 	 * filesystem anyway. */
 	u64 next_ino;
 
-	/* List of lookup table entries for files in the staging directory */
-	struct list_head staging_list;
-
 	/* List of inodes in the mounted image */
-	struct hlist_head *image_inode_list;
+	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
@@ -114,38 +119,43 @@ struct wimfs_context {
 	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);
 }
 
 #define WIMFS_CTX(fuse_ctx) ((struct wimfs_context*)(fuse_ctx)->private_data)
 
-static inline struct wimfs_context *wimfs_get_context()
+static inline struct wimfs_context *
+wimfs_get_context()
 {
 	return WIMFS_CTX(fuse_get_context());
 }
 
-static inline WIMStruct *wimfs_get_WIMStruct()
+static inline WIMStruct *
+wimfs_get_WIMStruct()
 {
 	return wimfs_get_context()->wim;
 }
 
-static inline bool wimfs_ctx_readonly(const struct wimfs_context *ctx)
+static inline bool
+wimfs_ctx_readonly(const struct wimfs_context *ctx)
 {
 	return (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) == 0;
 }
 
-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);
 }
@@ -161,11 +171,12 @@ static inline int flags_writable(int open_flags)
  *
  * Return 0 iff successful or error code if unsuccessful.
  */
-static int alloc_wimfs_fd(struct wim_inode *inode,
-			  u32 stream_id,
-			  struct wim_lookup_table_entry *lte,
-			  struct wimfs_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,
+	       bool readonly)
 {
 	static const u16 fds_per_alloc = 8;
 	static const u16 max_fds = 0xffff;
@@ -228,7 +239,8 @@ out:
 	return ret;
 }
 
-static void inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
+static void
+inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 {
 	wimlib_assert(inode != NULL);
 
@@ -249,7 +261,8 @@ static void inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd)
 	}
 }
 
-static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
+static int
+lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
 {
 	wimlib_assert(fd->f_lte == lte);
 
@@ -271,14 +284,15 @@ static int lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_fd *fd)
 }
 
 /* Close a file descriptor. */
-static int close_wimfs_fd(struct wimfs_fd *fd)
+static int
+close_wimfs_fd(struct wimfs_fd *fd)
 {
 	int ret;
 	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);
@@ -290,14 +304,15 @@ static int close_wimfs_fd(struct wimfs_fd *fd)
  *
  * 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)
+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(wimfs_ctx->wim, path);
 	if (!parent)
@@ -310,9 +325,9 @@ static int create_dentry(struct fuse_context *fuse_ctx,const char *path,
 	if (get_dentry_child_with_name(parent, basename))
 		return -EEXIST;
 
-	new = new_dentry_with_inode(basename);
-	if (!new)
-		return -errno;
+	ret = new_dentry_with_inode(basename, &new);
+	if (ret)
+		return -ENOMEM;
 
 	new->d_inode->i_resolved = 1;
 	new->d_inode->i_ino = wimfs_ctx->next_ino++;
@@ -331,7 +346,7 @@ static int create_dentry(struct fuse_context *fuse_ctx,const char *path,
 		}
 	}
 	dentry_add_child(parent, new);
-	hlist_add_head(&new->d_inode->i_hlist, wimfs_ctx->image_inode_list);
+	list_add_tail(&new->d_inode->i_list, wimfs_ctx->image_inode_list);
 	if (dentry_ret)
 		*dentry_ret = new;
 	return 0;
@@ -349,8 +364,9 @@ static int create_dentry(struct fuse_context *fuse_ctx,const char *path,
  * descriptors and no references remaining, it is freed, and the corresponding
  * staging file is unlinked.
  */
-static void remove_dentry(struct wim_dentry *dentry,
-			  struct wim_lookup_table *lookup_table)
+static void
+remove_dentry(struct wim_dentry *dentry,
+	      struct wim_lookup_table *lookup_table)
 {
 	struct wim_inode *inode = dentry->d_inode;
 	struct wim_lookup_table_entry *lte;
@@ -362,10 +378,11 @@ static void remove_dentry(struct wim_dentry *dentry,
 			lte_decrement_refcnt(lte, lookup_table);
 	}
 	unlink_dentry(dentry);
-	put_dentry(dentry);
+	free_dentry(dentry);
 }
 
-static mode_t inode_default_unix_mode(const struct wim_inode *inode)
+static mode_t
+inode_default_unix_mode(const struct wim_inode *inode)
 {
 	if (inode_is_symlink(inode))
 		return S_IFLNK | 0777;
@@ -380,9 +397,10 @@ static mode_t inode_default_unix_mode(const struct wim_inode *inode)
  * 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)
+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();
 
@@ -400,29 +418,31 @@ static int inode_to_stbuf(const struct wim_inode *inode,
 	}
 	stbuf->st_ino = (ino_t)inode->i_ino;
 	stbuf->st_nlink = inode->i_nlink;
-	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);
-		}
-	} else {
+	if (lte)
+		stbuf->st_size = wim_resource_size(lte);
+	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 = wim_timestamp_to_unix(inode->i_creation_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.
  *
@@ -435,7 +455,8 @@ static int inode_to_stbuf(const struct wim_inode *inode,
  * 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, struct wimfs_context *ctx)
+static int
+create_staging_file(char **name_ret, struct wimfs_context *ctx)
 {
 	size_t name_len;
 	char *name;
@@ -502,11 +523,12 @@ static int create_staging_file(char **name_ret, struct wimfs_context *ctx)
  *
  * Returns 0 on success or a negative error code on failure.
  */
-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)
+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;
@@ -623,18 +645,10 @@ static int extract_resource_to_staging_dir(struct wim_inode *inode,
 	new_lte->refcnt                       = inode->i_nlink;
 	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);
-
-	if (stream_id == 0)
-		inode->i_lte = new_lte;
-	else
-		for (u16 i = 0; i < inode->i_num_ads; i++)
-			if (inode->i_ads_entries[i].stream_id == stream_id)
-				inode->i_ads_entries[i].lte = new_lte;
+	new_lte->resource_entry.original_size = size;
 
-	lookup_table_insert(ctx->wim->lookup_table, new_lte);
-	list_add(&new_lte->staging_list, &ctx->staging_list);
+	lookup_table_insert_unhashed(ctx->wim->lookup_table, new_lte,
+				     inode, stream_id);
 	*lte = new_lte;
 	return 0;
 out_revert_fd_changes:
@@ -660,7 +674,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";
@@ -725,8 +740,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;
@@ -739,7 +755,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,
@@ -749,63 +766,8 @@ static int delete_staging_dir(struct wimfs_context *ctx)
 	return ret;
 }
 
-static void inode_update_lte_ptr(struct wim_inode *inode,
-				 struct wim_lookup_table_entry *old_lte,
-				 struct wim_lookup_table_entry *new_lte)
-{
-	if (inode->i_lte == old_lte) {
-		inode->i_lte = new_lte;
-	} else {
-		for (unsigned i = 0; i < inode->i_num_ads; i++) {
-			if (inode->i_ads_entries[i].lte == old_lte) {
-				inode->i_ads_entries[i].lte = new_lte;
-				break;
-			}
-		}
-	}
-}
-
-static int update_lte_of_staging_file(struct wim_lookup_table_entry *lte,
-				      struct wim_lookup_table *table)
-{
-	struct wim_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 {
-			BUILD_BUG_ON(&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 wim_inode *inode)
+static int
+inode_close_fds(struct wim_inode *inode)
 {
 	u16 num_opened_fds = inode->i_num_opened_fds;
 	for (u16 i = 0, j = 0; j < num_opened_fds; i++) {
@@ -822,38 +784,45 @@ static int inode_close_fds(struct wim_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 wim_lookup_table_entry *lte, *tmp;
 	WIMStruct *w = 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_safe(lte, tmp, &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 (wim_resource_size(lte) == 0) {
+			print_lookup_table_entry(lte, stderr);
+			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)
+	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)
@@ -865,8 +834,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";
@@ -910,7 +879,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);
@@ -927,7 +897,8 @@ 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;
@@ -974,7 +945,8 @@ out:
 /* 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;
@@ -1003,11 +975,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);
 
@@ -1027,14 +1000,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);
@@ -1099,8 +1074,8 @@ struct daemon_msg_handler_context {
 	struct wimfs_context *wimfs_ctx;
 };
 
-static int send_unmount_request_msg(mqd_t mq, int unmount_flags,
-				    u8 want_progress_messages)
+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 = {
@@ -1121,7 +1096,8 @@ 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);
@@ -1143,7 +1119,8 @@ 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 = {
@@ -1159,8 +1136,9 @@ 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 = {
@@ -1182,7 +1160,8 @@ static int unmount_progress_func(enum wimlib_progress_msg msg,
 	return 0;
 }
 
-static int msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
+static int
+msg_unmount_request_handler(const void *_msg, void *_handler_ctx)
 {
 	const struct msg_unmount_request *msg = _msg;
 	struct daemon_msg_handler_context *handler_ctx = _handler_ctx;
@@ -1244,7 +1223,8 @@ out:
 	return MSG_BREAK_LOOP;
 }
 
-static int msg_daemon_info_handler(const void *_msg, void *_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;
@@ -1261,8 +1241,8 @@ static int msg_daemon_info_handler(const void *_msg, void *_handler_ctx)
 	return 0;
 }
 
-static int msg_write_streams_progress_handler(const void *_msg,
-					      void *_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;
@@ -1276,7 +1256,8 @@ static int msg_write_streams_progress_handler(const void *_msg,
 	return 0;
 }
 
-static int msg_unmount_finished_handler(const void *_msg, void *_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;
@@ -1289,7 +1270,8 @@ static int msg_unmount_finished_handler(const void *_msg, void *_handler_ctx)
 	return MSG_BREAK_LOOP;
 }
 
-static int unmount_timed_out_cb(void *_handler_ctx)
+static int
+unmount_timed_out_cb(void *_handler_ctx)
 {
 	struct unmount_msg_handler_context *handler_ctx = _handler_ctx;
 
@@ -1312,7 +1294,8 @@ out_crashed:
 	return WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED;
 }
 
-static int daemon_timed_out_cb(void *_handler_ctx)
+static int
+daemon_timed_out_cb(void *_handler_ctx)
 {
 	ERROR("Timed out waiting for unmount request! "
 	      "Changes to the mounted WIM will not be committed.");
@@ -1342,10 +1325,11 @@ static const struct msg_handler_callbacks daemon_msg_handler_callbacks = {
 	},
 };
 
-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)
+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;
@@ -1387,9 +1371,10 @@ static int receive_message(mqd_t mq,
 	return ret;
 }
 
-static int message_loop(mqd_t mq,
-			const struct msg_handler_callbacks *callbacks,
-			struct msg_handler_context_hdr *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;
@@ -1437,7 +1422,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)
 {
 	pid_t pid;
 	int ret;
@@ -1514,7 +1500,8 @@ static int wimfs_access(const char *path, int mask)
 }
 #endif
 
-static int wimfs_chmod(const char *path, mode_t mask)
+static int
+wimfs_chmod(const char *path, mode_t mask)
 {
 	struct wim_dentry *dentry;
 	struct wimfs_context *ctx = wimfs_get_context();
@@ -1534,7 +1521,8 @@ static int wimfs_chmod(const char *path, mode_t mask)
 	return ret ? -ENOMEM : 0;
 }
 
-static int wimfs_chown(const char *path, uid_t uid, gid_t gid)
+static int
+wimfs_chown(const char *path, uid_t uid, gid_t gid)
 {
 	struct wim_dentry *dentry;
 	struct wimfs_context *ctx = wimfs_get_context();
@@ -1556,7 +1544,8 @@ static int wimfs_chown(const char *path, uid_t uid, gid_t gid)
 }
 
 /* Called when the filesystem is unmounted. */
-static void wimfs_destroy(void *p)
+static void
+wimfs_destroy(void *p)
 {
 	struct wimfs_context *wimfs_ctx = wimfs_get_context();
 	if (open_message_queues(wimfs_ctx, true) == 0) {
@@ -1583,29 +1572,31 @@ static int wimfs_fallocate(const char *path, int mode,
 
 #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 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 wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	int ret = ftruncate(fd->staging_fd, size);
-	if (ret != 0)
+	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->resource_entry.original_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 wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -1622,8 +1613,9 @@ 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 wim_inode *inode;
@@ -1656,8 +1648,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
 	if (res_size > size)
 		return -ERANGE;
 
-	ret = read_full_wim_resource(lte, (u8*)value,
-				     WIMLIB_RESOURCE_FLAG_MULTITHREADED);
+	ret = read_full_resource_into_buf(lte, value, true);
 	if (ret != 0)
 		return -EIO;
 
@@ -1666,14 +1657,14 @@ static int wimfs_getxattr(const char *path, const char *name, char *value,
 #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 wim_dentry *from_dentry, *from_dentry_parent;
 	const char *link_name;
 	struct wim_inode *inode;
-	struct wim_lookup_table_entry *lte;
 	WIMStruct *w = wimfs_get_WIMStruct();
-	u16 i;
+	int ret;
 
 	inode = wim_pathname_to_inode(w, to);
 	if (!inode)
@@ -1692,31 +1683,29 @@ static int wimfs_link(const char *to, const char *from)
 	link_name = path_basename(from);
 	if (get_dentry_child_with_name(from_dentry_parent, link_name))
 		return -EEXIST;
-	from_dentry = new_dentry(link_name);
-	if (!from_dentry)
-		return -errno;
 
-	inode_add_dentry(from_dentry, inode);
-	from_dentry->d_inode = inode;
-	inode->i_nlink++;
+	ret = new_dentry(link_name, &from_dentry);
+	if (ret)
+		return -ENOMEM;
 
-	for (i = 0; i <= inode->i_num_ads; i++) {
-		lte = inode_stream_lte_resolved(inode, i);
-		if (lte)
-			lte->refcnt++;
-	}
+	inode->i_nlink++;
+	inode_ref_streams(inode);
+	from_dentry->d_inode = inode;
+	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 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;
@@ -1727,36 +1716,47 @@ static int wimfs_listxattr(const char *path, char *list, size_t size)
 	if (!inode)
 		return -errno;
 
-	if (size == 0) {
-		needed_size = 0;
-		for (i = 0; i < inode->i_num_ads; i++)
-			needed_size += inode->i_ads_entries[i].stream_name_utf8_len + 6;
-		return needed_size;
-	} else {
-		p = list;
-		for (i = 0; i < inode->i_num_ads; i++) {
-			needed_size = inode->i_ads_entries[i].stream_name_utf8_len + 6;
-			if (needed_size > size)
+	p = list;
+	for (i = 0; i < inode->i_num_ads; i++) {
+		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->i_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 image. */
-static int wimfs_mkdir(const char *path, mode_t mode)
+static int
+wimfs_mkdir(const char *path, mode_t mode)
 {
 	return create_dentry(fuse_get_context(), path, mode | S_IFDIR,
 			     FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
 /* 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)
+static int
+wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 {
 	const char *stream_name;
 	struct fuse_context *fuse_ctx = fuse_get_context();
@@ -1778,8 +1778,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 		inode = wim_pathname_to_inode(wimfs_ctx->wim, path);
 		if (!inode)
 			return -errno;
-		if (inode->i_attributes &
-		    (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
+		if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
 			return -ENOENT;
 		if (inode_get_ads_entry(inode, stream_name, NULL))
 			return -EEXIST;
@@ -1794,9 +1793,9 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
 	}
 }
 
-
 /* 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 wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -1806,6 +1805,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 	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);
@@ -1814,10 +1814,13 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 
 	inode = dentry->d_inode;
 
-	if (stream_idx == 0)
+	if (stream_idx == 0) {
 		stream_id = 0;
-	else
+		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
@@ -1833,7 +1836,9 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 						      &lte, size, ctx);
 		if (ret != 0)
 			return ret;
+		*back_ptr = lte;
 	}
+	print_lookup_table_entry(lte, stderr);
 
 	ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
 			     wimfs_ctx_readonly(ctx));
@@ -1853,7 +1858,8 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 }
 
 /* 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 wim_inode *inode;
 	int ret;
@@ -1875,11 +1881,13 @@ 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 wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	ssize_t ret;
+	u64 res_size;
 
 	if (!fd)
 		return -EBADF;
@@ -1887,32 +1895,34 @@ static int wimfs_read(const char *path, char *buf, size_t size,
 	if (!fd->f_lte) /* Empty stream with no lookup table entry */
 		return 0;
 
-	if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-		/* Read from staging file */
-
-		wimlib_assert(fd->f_lte->staging_file_name);
-		wimlib_assert(fd->staging_fd != -1);
+	res_size = wim_resource_size(fd->f_lte);
+	if (offset > res_size)
+		return -EOVERFLOW;
+	size = min(size, INT_MAX);
+	size = min(size, res_size - offset);
 
-		DEBUG("Seek to offset %"PRIu64, offset);
-
-		if (lseek(fd->staging_fd, offset, SEEK_SET) == -1)
-			return -errno;
-		ret = read(fd->staging_fd, buf, size);
-		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;
+	switch (fd->f_lte->resource_location) {
+	case RESOURCE_IN_STAGING_FILE:
+		ret = pread(fd->staging_fd, buf, size, offset);
+		if (ret < 0)
+			ret = -errno;
+		break;
+	case RESOURCE_IN_WIM:
+		if (read_partial_wim_resource_into_buf(fd->f_lte, size,
+						       offset, buf, true))
+			ret = -errno;
+		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 {
@@ -1920,17 +1930,32 @@ struct fill_params {
 	fuse_fill_dir_t filler;
 };
 
-static int dentry_fuse_fill(struct wim_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 wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	struct wim_inode *inode;
@@ -1953,7 +1978,8 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 }
 
 
-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 wim_inode *inode = wim_pathname_to_inode(ctx->wim, path);
@@ -1963,22 +1989,23 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len)
 	if (!inode_is_symlink(inode))
 		return -EINVAL;
 
-	ret = inode_readlink(inode, buf, buf_len, ctx->wim,
-			     WIMLIB_RESOURCE_FLAG_MULTITHREADED);
+	ret = inode_readlink(inode, buf, buf_len, ctx->wim, true);
 	if (ret > 0)
 		ret = 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 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 wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	return close_wimfs_fd(fd);
@@ -1986,7 +2013,8 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi)
 
 #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 wim_inode *inode;
 	struct wim_ads_entry *ads_entry;
@@ -2013,7 +2041,8 @@ 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)
+static int
+wimfs_rename(const char *from, const char *to)
 {
 	struct wim_dentry *src;
 	struct wim_dentry *dst;
@@ -2070,7 +2099,8 @@ static int wimfs_rename(const char *from, const char *to)
 }
 
 /* Remove a directory */
-static int wimfs_rmdir(const char *path)
+static int
+wimfs_rmdir(const char *path)
 {
 	struct wim_dentry *dentry;
 	WIMStruct *w = wimfs_get_WIMStruct();
@@ -2091,8 +2121,9 @@ static int wimfs_rmdir(const char *path)
 
 #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)
+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;
@@ -2120,7 +2151,7 @@ static int wimfs_setxattr(const char *path, const char *name,
 			return -ENOATTR;
 	}
 
-	ret = inode_add_ads_with_data(inode, name, (const u8*)value,
+	ret = inode_add_ads_with_data(inode, name, value,
 				      size, ctx->wim->lookup_table);
 	if (ret == 0) {
 		if (existing_ads_entry)
@@ -2132,7 +2163,8 @@ static int wimfs_setxattr(const char *path, const char *name,
 }
 #endif
 
-static int wimfs_symlink(const char *to, const char *from)
+static int
+wimfs_symlink(const char *to, const char *from)
 {
 	struct fuse_context *fuse_ctx = fuse_get_context();
 	struct wimfs_context *wimfs_ctx = WIMFS_CTX(fuse_ctx);
@@ -2155,7 +2187,8 @@ 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 wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -2174,19 +2207,20 @@ 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->i_ads_entries[stream_idx - 1].stream_id;
-
 	if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
 		ret = truncate(lte->staging_file_name, size);
-		if (ret != 0)
+		if (ret)
 			ret = -errno;
+		else
+			lte->resource_entry.original_size = size;
 	} else {
 		/* File in WIM.  Extract it to the staging directory, but only
 		 * the first @size bytes of it. */
+		inode = dentry->d_inode;
+		if (stream_idx == 0)
+			stream_id = 0;
+		else
+			stream_id = inode->i_ads_entries[stream_idx - 1].stream_id;
 		ret = extract_resource_to_staging_dir(inode, stream_id,
 						      &lte, size, ctx);
 	}
@@ -2194,7 +2228,8 @@ static int wimfs_truncate(const char *path, off_t size)
 }
 
 /* Unlink a non-directory or alternate data stream */
-static int wimfs_unlink(const char *path)
+static int
+wimfs_unlink(const char *path)
 {
 	struct wim_dentry *dentry;
 	struct wim_lookup_table_entry *lte;
@@ -2222,7 +2257,8 @@ 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 wim_dentry *dentry;
 	struct wim_inode *inode;
@@ -2237,18 +2273,19 @@ static int wimfs_utimens(const char *path, const struct timespec tv[2])
 		if (tv[0].tv_nsec == UTIME_NOW)
 			inode->i_last_access_time = get_wim_timestamp();
 		else
-			inode->i_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->i_last_write_time = get_wim_timestamp();
 		else
-			inode->i_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 wim_dentry *dentry;
 	struct wim_inode *inode;
@@ -2263,38 +2300,41 @@ static int wimfs_utime(const char *path, struct utimbuf *times)
 	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 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->f_lte != NULL);
+	wimlib_assert(fd->f_lte->staging_file_name != NULL);
 	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_inode != NULL);
 
 	/* Write the data. */
-	ret = write(fd->staging_fd, buf, size);
+	ret = pwrite(fd->staging_fd, buf, size, offset);
 	if (ret == -1)
 		return -errno;
 
-	now = get_wim_timestamp();
-	fd->f_inode->i_last_write_time = now;
-	fd->f_inode->i_last_access_time = now;
+	/* Update file size */
+	if (offset + size > fd->f_lte->resource_entry.original_size) {
+		DEBUG("Update file size %"PRIu64 " => %"PRIu64"",
+		      fd->f_lte->resource_entry.original_size,
+		      offset + size);
+		fd->f_lte->resource_entry.original_size = offset + size;
+	}
+
+	/* Update timestamps */
+	touch_inode(fd->f_inode);
 	return ret;
 }
 
@@ -2359,10 +2399,11 @@ 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)
+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)
 {
 	int argc;
 	char *argv[16];
@@ -2371,7 +2412,6 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	struct wim_lookup_table *joined_tab, *wim_tab_save;
 	struct wim_image_metadata *imd;
 	struct wimfs_context ctx;
-	struct hlist_node *cur_node;
 	struct wim_inode *inode;
 
 	DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ",
@@ -2381,7 +2421,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		return WIMLIB_ERR_INVALID_PARAM;
 
 	ret = verify_swm_set(wim, additional_swms, num_additional_swms);
-	if (ret != 0)
+	if (ret)
 		return ret;
 
 	if ((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) && (wim->hdr.total_parts != 1)) {
@@ -2393,7 +2433,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		ret = new_joined_lookup_table(wim, additional_swms,
 					      num_additional_swms,
 					      &joined_tab);
-		if (ret != 0)
+		if (ret)
 			return ret;
 		wim_tab_save = wim->lookup_table;
 		wim->lookup_table = joined_tab;
@@ -2401,28 +2441,29 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 
 	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
 		ret = wim_run_full_verifications(wim);
-		if (ret != 0)
+		if (ret)
 			goto out;
 	}
 
+	ret = wim_checksum_unhashed_streams(wim);
+	if (ret)
+		goto out;
+
 	ret = select_wim_image(wim, image);
-	if (ret != 0)
+	if (ret)
 		goto out;
 
 	DEBUG("Selected image %d", image);
 
 	imd = wim_get_current_image_metadata(wim);
 
-	if (imd->root_dentry->refcnt != 1) {
+	if (imd->refcnt != 1) {
 		ERROR("Cannot mount image that was just exported with "
 		      "wimlib_export_image()");
 		ret = WIMLIB_ERR_INVALID_PARAM;
 		goto out;
 	}
 
-	if (imd->inode_list.first) /* May be unneeded? */
-		imd->inode_list.first->pprev = &imd->inode_list.first;
-
 	if (imd->modified) {
 		ERROR("Cannot mount image that was added "
 		      "with wimlib_add_image()");
@@ -2432,7 +2473,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 
 	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
 		ret = lock_wim(wim, wim->fp);
-		if (ret != 0)
+		if (ret)
 			goto out;
 	}
 
@@ -2442,7 +2483,6 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 		       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;
@@ -2450,12 +2490,14 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	ctx.image_inode_list = &imd->inode_list;
 	ctx.default_uid = getuid();
 	ctx.default_gid = getgid();
+	wimlib_assert(list_empty(&imd->unhashed_streams));
+	ctx.wim->lookup_table->unhashed_streams = &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);
 
@@ -2493,7 +2535,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	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 */
@@ -2526,7 +2568,7 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 	 * 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, i_hlist) {
+	image_for_each_inode(inode, imd) {
 		inode_resolve_ltes(inode, wim->lookup_table);
 		inode->i_ino = ctx.next_ino++;
 	}
@@ -2573,8 +2615,9 @@ out:
  * 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)
+WIMLIBAPI int
+wimlib_unmount_image(const char *dir, int unmount_flags,
+		     wimlib_progress_func_t progress_func)
 {
 	int ret;
 	struct wimfs_context wimfs_ctx;
@@ -2623,25 +2666,32 @@ out:
 #else /* WITH_FUSE */
 
 
-static inline int mount_unsupported_error()
+static int
+mount_unsupported_error()
 {
+#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, WIMStruct **additional_swms,
+		   unsigned num_additional_swms,
+		   const tchar *staging_dir)
 {
 	return mount_unsupported_error();
 }
 
-#endif /* WITH_FUSE */
+#endif /* !WITH_FUSE */