X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmount_image.c;h=cc1bb5f9efe6d68935dadfe8f79b4e566d2f2147;hb=2fc33f535a398ea85964c0e483c5692821d775f3;hp=9d7ddd326f7fc0f9fb222c62b34684a1106ed5fb;hpb=d8af927e5d02cbcfc45cd1a3568b31c9814ec6f5;p=wimlib

diff --git a/src/mount_image.c b/src/mount_image.c
index 9d7ddd32..cc1bb5f9 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -357,7 +357,7 @@ inode_get_data_stream_tstr(const struct wim_inode *inode,
 	struct wim_inode_stream *strm;
 
 	if (!stream_name || !*stream_name) {
-		strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+		strm = inode_get_unnamed_data_stream(inode);
 	} else {
 		const utf16lechar *uname;
 
@@ -502,8 +502,8 @@ create_file(struct fuse_context *fuse_ctx, const char *path,
 		}
 	}
 
-	list_add_tail(&new_inode->i_list,
-		      &wim_get_current_image_metadata(wimfs_ctx->wim)->inode_list);
+	hlist_add_head(&new_inode->i_hlist,
+		       &wim_get_current_image_metadata(wimfs_ctx->wim)->inode_list);
 
 	dentry_add_child(parent, new_dentry);
 
@@ -549,6 +549,25 @@ inode_default_unix_mode(const struct wim_inode *inode)
 	return inode_unix_file_type(inode) | 0777;
 }
 
+static u64
+blob_size(const struct blob_descriptor *blob)
+{
+	if (!blob)
+		return 0;
+	return blob->size;
+}
+
+static u64
+blob_stored_size(const struct blob_descriptor *blob)
+{
+	if (!blob)
+		return 0;
+	if (blob->blob_location == BLOB_IN_WIM &&
+	    blob->size == blob->rdesc->uncompressed_size)
+		return blob->rdesc->size_in_wim;
+	return blob->size;
+}
+
 /*
  * Retrieve standard UNIX metadata ('struct stat') for a WIM inode.
  *
@@ -586,8 +605,7 @@ inode_to_stbuf(const struct wim_inode *inode,
 	}
 	stbuf->st_ino = inode->i_ino;
 	stbuf->st_nlink = inode->i_nlink;
-	if (blob)
-		stbuf->st_size = blob->size;
+	stbuf->st_size = blob_size(blob);
 #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);
@@ -597,7 +615,7 @@ inode_to_stbuf(const struct wim_inode *inode,
 	stbuf->st_mtime = wim_timestamp_to_time_t(inode->i_last_write_time);
 	stbuf->st_ctime = stbuf->st_mtime;
 #endif
-	stbuf->st_blocks = DIV_ROUND_UP(stbuf->st_size, 512);
+	stbuf->st_blocks = DIV_ROUND_UP(blob_stored_size(blob), 512);
 	return 0;
 }
 
@@ -983,12 +1001,13 @@ inode_close_fds(struct wim_inode *inode)
 static void
 close_all_fds(struct wimfs_context *ctx)
 {
-	struct wim_inode *inode, *tmp;
+	struct wim_inode *inode;
+	struct hlist_node *tmp;
 	struct wim_image_metadata *imd;
 
 	imd = wim_get_current_image_metadata(ctx->wim);
 
-	list_for_each_entry_safe(inode, tmp, &imd->inode_list, i_list)
+	image_for_each_inode_safe(inode, tmp, imd)
 		inode_close_fds(inode);
 }
 
@@ -1573,7 +1592,7 @@ wimfs_open(const char *path, struct fuse_file_info *fi)
             (!blob || blob->blob_location != BLOB_IN_STAGING_FILE)) {
 		ret = extract_blob_to_staging_dir(inode,
 						  strm,
-						  blob ? blob->size : 0,
+						  blob_size(blob),
 						  ctx);
 		if (ret)
 			return ret;
@@ -1613,7 +1632,7 @@ wimfs_opendir(const char *path, struct fuse_file_info *fi)
 		return -errno;
 	if (!inode_is_directory(inode))
 		return -ENOTDIR;
-	strm = inode_get_unnamed_stream(inode, STREAM_TYPE_DATA);
+	strm = inode_get_unnamed_data_stream(inode);
 	if (!strm)
 		return -ENOTDIR;
 	ret = alloc_wimfs_fd(inode, strm, &fd);
@@ -2125,6 +2144,11 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 			return ret;
 	}
 
+	if (wim_has_solid_resources(wim)) {
+		WARNING("Mounting a WIM file containing solid-compressed data; "
+			"file access may be slow.");
+	}
+
 	/* If the user did not specify an interface for accessing named
 	 * data streams, use the default (extended attributes).  */
 	if (!(mount_flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE |