* 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
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)
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);
}
}
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;
lte_decrement_refcnt(lte, lookup_table);
}
unlink_dentry(dentry);
- put_dentry(dentry);
+ free_dentry(dentry);
}
static mode_t
}
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);
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);
+ new_lte->resource_entry.original_size = size;
- 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;
-
- 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:
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(<e->file_on_disk != <e->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)
{
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(<e->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;
}
{
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;
}
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;
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 (ret)
return -ENOMEM;
- inode_add_dentry(from_dentry, inode);
- from_dentry->d_inode = inode;
inode->i_nlink++;
-
- for (i = 0; i <= inode->i_num_ads; i++) {
- lte = inode_stream_lte_resolved(inode, i);
- if (lte)
- lte->refcnt++;
- }
+ 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;
}
size_t stream_name_mbs_nbytes;
int ret;
- ret = utf16le_to_mbs(inode->i_ads_entries[i].stream_name,
- inode->i_ads_entries[i].stream_name_nbytes,
- &stream_name_mbs,
- &stream_name_mbs_nbytes);
+ 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;
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;
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, <e, &stream_idx);
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
<e, 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));
{
struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
ssize_t ret;
+ u64 res_size;
if (!fd)
return -EBADF;
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 */
+ 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);
- wimlib_assert(fd->f_lte->staging_file_name);
- wimlib_assert(fd->staging_fd != -1);
-
- 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, 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 {
size_t file_name_mbs_nbytes;
int ret;
- ret = utf16le_to_mbs(dentry->file_name,
- dentry->file_name_nbytes,
- &file_name_mbs,
- &file_name_mbs_nbytes);
+ ret = utf16le_to_tstr(dentry->file_name,
+ dentry->file_name_nbytes,
+ &file_name_mbs,
+ &file_name_mbs_nbytes);
if (ret)
return -errno;
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;
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,
<e, size, ctx);
}
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;
+ /* 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;
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, ",
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)) {
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;
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()");
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
ret = lock_wim(wim, wim->fp);
- if (ret != 0)
+ if (ret)
goto out;
}
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.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);
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 */
* 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++;
}
git://wimlib.net / wimlib / blobdiff