X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=cc1c57dc90f8def293b3d186cb39703be54441e7;hp=a207b42a6fd449e883e30e2f27741e42cf59db0d;hb=d5984b47ca93ee5fa96a3d49aa5017b10e10e399;hpb=f847472bcb4fb6b766fcdebfe88ebaa01a5bce63 diff --git a/src/mount_image.c b/src/mount_image.c index a207b42a..cc1c57dc 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -46,7 +46,6 @@ #include "wimlib/paths.h" #include "wimlib/reparse.h" #include "wimlib/resource.h" -#include "wimlib/swm.h" #include "wimlib/timestamp.h" #include "wimlib/version.h" #include "wimlib/write.h" @@ -80,7 +79,7 @@ struct wimfs_fd { struct wim_inode *f_inode; struct wim_lookup_table_entry *f_lte; - int staging_fd; + struct filedes staging_fd; u16 idx; u32 stream_id; }; @@ -116,9 +115,9 @@ struct wimfs_context { /* 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() (i.e. the `imagex unmount' command) needs to - * communicate with the filesystem daemon running fuse_main() (i.e. the - * daemon created by the `imagex mount' or `imagex mountrw' commands */ + * 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; @@ -194,8 +193,6 @@ alloc_wimfs_fd(struct wim_inode *inode, static const u16 max_fds = 0xffff; int ret; - pthread_mutex_lock(&inode->i_mutex); - DEBUG("Allocating fd for stream ID %u from inode %#"PRIx64" " "(open = %u, allocated = %u)", stream_id, inode->i_ino, inode->i_num_opened_fds, @@ -231,13 +228,13 @@ alloc_wimfs_fd(struct wim_inode *inode, 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->i_fds[i] = fd; + 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 && !readonly) lte->num_opened_fds++; @@ -247,7 +244,6 @@ alloc_wimfs_fd(struct wim_inode *inode, } } out: - pthread_mutex_unlock(&inode->i_mutex); return ret; } @@ -255,9 +251,6 @@ 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->i_num_opened_fds != 0); wimlib_assert(fd->idx < inode->i_num_allocated_fds); @@ -265,11 +258,12 @@ inode_put_fd(struct wim_inode *inode, struct wimfs_fd *fd) inode->i_fds[fd->idx] = NULL; FREE(fd); - if (--inode->i_num_opened_fds == 0 && inode->i_nlink == 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); } } @@ -284,9 +278,9 @@ lte_put_fd(struct wim_lookup_table_entry *lte, struct wimfs_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; } @@ -488,7 +482,7 @@ create_staging_file(char **name_ret, struct wimfs_context *ctx) 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); + name = MALLOC(name_len + 1); if (!name) { errno = ENOMEM; return -1; @@ -572,8 +566,11 @@ extract_resource_to_staging_dir(struct wim_inode *inode, /* Extract the stream to the staging file (possibly truncated) */ if (old_lte) { + struct filedes wimlib_fd; + filedes_init(&wimlib_fd, fd); extract_size = min(wim_resource_size(old_lte), size); - ret = extract_wim_resource_to_fd(old_lte, fd, extract_size); + ret = extract_wim_resource_to_fd(old_lte, &wimlib_fd, + extract_size); } else { ret = 0; extract_size = 0; @@ -642,15 +639,18 @@ extract_resource_to_staging_dir(struct wim_inode *inode, 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++; } @@ -678,9 +678,9 @@ out_revert_fd_changes: 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++; } @@ -812,7 +812,7 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags, { int ret; struct wim_lookup_table_entry *lte, *tmp; - WIMStruct *w = ctx->wim; + WIMStruct *wim = ctx->wim; struct wim_image_metadata *imd = wim_get_current_image_metadata(ctx->wim); DEBUG("Closing all staging file descriptors."); @@ -834,8 +834,8 @@ rebuild_wim(struct wimfs_context *ctx, int write_flags, } } - xml_update_image_info(w, w->current_image); - ret = wimlib_overwrite(w, write_flags, 0, progress_func); + 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; @@ -864,7 +864,7 @@ set_message_queue_names(struct wimfs_context *ctx, const char *mount_dir) 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) @@ -1539,8 +1539,8 @@ wimfs_chmod(const char *path, mode_t mask) if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA)) return -EPERM; - ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, - &dentry, NULL, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); if (ret) return ret; @@ -1560,8 +1560,8 @@ wimfs_chown(const char *path, uid_t uid, gid_t gid) if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_UNIX_DATA)) return -EPERM; - ret = lookup_resource(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, - &dentry, NULL, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); if (ret) return ret; @@ -1602,7 +1602,7 @@ 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); + int ret = ftruncate(fd->staging_fd.fd, size); if (ret) return -errno; touch_inode(fd->f_inode); @@ -1621,9 +1621,10 @@ wimfs_getattr(const char *path, struct stat *stbuf) int ret; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, - get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK, - &dentry, <e, NULL); + ret = wim_pathname_to_stream(ctx->wim, path, + get_lookup_flags(ctx) | + LOOKUP_FLAG_DIRECTORY_OK, + &dentry, <e, NULL); if (ret != 0) return ret; return inode_to_stbuf(dentry->d_inode, lte, stbuf); @@ -1667,9 +1668,12 @@ wimfs_getxattr(const char *path, const char *name, char *value, return -ERANGE; ret = read_full_resource_into_buf(lte, value); - if (ret) - return -EIO; - + if (ret) { + if (errno) + return -errno; + else + return -EIO; + } return res_size; } #endif @@ -1681,10 +1685,10 @@ wimfs_link(const char *to, const char *from) struct wim_dentry *from_dentry, *from_dentry_parent; const char *link_name; struct wim_inode *inode; - WIMStruct *w = wimfs_get_WIMStruct(); + WIMStruct *wim = wimfs_get_WIMStruct(); int ret; - inode = wim_pathname_to_inode(w, to); + inode = wim_pathname_to_inode(wim, to); if (!inode) return -errno; @@ -1692,7 +1696,7 @@ wimfs_link(const char *to, const char *from) FILE_ATTRIBUTE_REPARSE_POINT)) return -EPERM; - from_dentry_parent = get_parent_dentry(w, from); + from_dentry_parent = get_parent_dentry(wim, from); if (!from_dentry_parent) return -errno; if (!dentry_is_directory(from_dentry_parent)) @@ -1825,8 +1829,8 @@ wimfs_open(const char *path, struct fuse_file_info *fi) 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); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret) return ret; @@ -1863,12 +1867,15 @@ wimfs_open(const char *path, struct fuse_file_info *fi) 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_wimfs_fd(fd); return -errno_save; } + filedes_init(&fd->staging_fd, raw_fd); } fi->fh = (uintptr_t)fd; return 0; @@ -1882,9 +1889,9 @@ wimfs_opendir(const char *path, struct fuse_file_info *fi) int ret; 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 -errno; if (!inode_is_directory(inode)) @@ -1926,8 +1933,8 @@ wimfs_read(const char *path, char *buf, size_t size, switch (fd->f_lte->resource_location) { case RESOURCE_IN_STAGING_FILE: - ret = full_pread(fd->staging_fd, buf, size, offset); - if (ret != size) + ret = raw_pread(&fd->staging_fd, buf, size, offset); + if (ret == -1) ret = -errno; break; case RESOURCE_IN_WIM: @@ -2014,7 +2021,7 @@ wimfs_readlink(const char *path, char *buf, size_t buf_len) return -EINVAL; if (buf_len == 0) return -ENAMETOOLONG; - ret = wim_inode_readlink(inode, buf, buf_len - 1); + ret = wim_inode_readlink(inode, buf, buf_len - 1, NULL); if (ret >= 0) { wimlib_assert(ret <= buf_len - 1); buf[ret] = '\0'; @@ -2082,9 +2089,9 @@ static int wimfs_rmdir(const char *path) { struct wim_dentry *dentry; - WIMStruct *w = wimfs_get_WIMStruct(); + WIMStruct *wim = wimfs_get_WIMStruct(); - dentry = get_dentry(w, path); + dentry = get_dentry(wim, path); if (!dentry) return -errno; @@ -2094,7 +2101,7 @@ wimfs_rmdir(const char *path) if (dentry_has_children(dentry)) return -ENOTEMPTY; - remove_dentry(dentry, w->lookup_table); + remove_dentry(dentry, wim->lookup_table); return 0; } @@ -2180,8 +2187,8 @@ wimfs_truncate(const char *path, off_t size) struct wim_inode *inode; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), - &dentry, <e, &stream_idx); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; @@ -2189,7 +2196,7 @@ wimfs_truncate(const char *path, off_t size) if (lte == NULL && size == 0) return 0; - 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) ret = -errno; @@ -2225,8 +2232,8 @@ wimfs_unlink(const char *path) u16 stream_idx; struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), - &dentry, <e, &stream_idx); + ret = wim_pathname_to_stream(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; @@ -2250,9 +2257,9 @@ wimfs_utimens(const char *path, const struct timespec tv[2]) { struct wim_dentry *dentry; struct wim_inode *inode; - WIMStruct *w = wimfs_get_WIMStruct(); + WIMStruct *wim = wimfs_get_WIMStruct(); - dentry = get_dentry(w, path); + dentry = get_dentry(wim, path); if (!dentry) return -errno; inode = dentry->d_inode; @@ -2277,9 +2284,9 @@ wimfs_utime(const char *path, struct utimbuf *times) { struct wim_dentry *dentry; struct wim_inode *inode; - WIMStruct *w = wimfs_get_WIMStruct(); + WIMStruct *wim = wimfs_get_WIMStruct(); - dentry = get_dentry(w, path); + dentry = get_dentry(wim, path); if (!dentry) return -errno; inode = dentry->d_inode; @@ -2305,12 +2312,12 @@ wimfs_write(const char *path, const char *buf, size_t size, wimlib_assert(fd->f_lte != NULL); wimlib_assert(fd->f_lte->staging_file_name != NULL); - wimlib_assert(fd->staging_fd != -1); + wimlib_assert(filedes_valid(&fd->staging_fd)); wimlib_assert(fd->f_inode != NULL); /* Write the data. */ - ret = full_pwrite(fd->staging_fd, buf, size, offset); - if (ret != size) + ret = raw_pwrite(&fd->staging_fd, buf, size, offset); + if (ret == -1) return -errno; /* Update file size */ @@ -2380,12 +2387,10 @@ static struct fuse_operations wimfs_operations = { }; -/* Mounts an image from a WIM file. */ +/* API function documented in wimlib.h */ 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 mount_flags, const char *staging_dir) { int argc; char *argv[16]; @@ -2398,27 +2403,18 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ", wim, image, dir, mount_flags); - if (!wim || !dir) { - ret = WIMLIB_ERR_INVALID_PARAM; - goto out; - } - - ret = verify_swm_set(wim, additional_swms, num_additional_swms); - if (ret) - goto out; + if (!wim || !dir) + return WIMLIB_ERR_INVALID_PARAM; if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { ret = can_delete_from_wim(wim); if (ret) - goto out; + return ret; } - if (num_additional_swms) - merge_lookup_tables(wim, additional_swms, num_additional_swms); - ret = select_wim_image(wim, image); if (ret) - goto out_restore_lookup_table; + return ret; DEBUG("Selected image %d", image); @@ -2427,21 +2423,19 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, if (imd->refcnt != 1) { ERROR("Cannot mount image that was just exported with " "wimlib_export_image()"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out_restore_lookup_table; + return WIMLIB_ERR_INVALID_PARAM; } if (imd->modified) { ERROR("Cannot mount image that was added " "with wimlib_add_image()"); - ret = WIMLIB_ERR_INVALID_PARAM; - goto out_restore_lookup_table; + return WIMLIB_ERR_INVALID_PARAM; } if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { - ret = lock_wim(wim, wim->in_fd); + ret = lock_wim(wim, wim->in_fd.fd); if (ret) - goto out_restore_lookup_table; + return ret; } /* Use default stream interface if one was not specified */ @@ -2475,12 +2469,11 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, goto out_free_message_queue_names; argc = 0; - argv[argc++] = "imagex"; + 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"; @@ -2566,17 +2559,10 @@ out_unlock: wim->wim_locked = 0; out_free_message_queue_names: free_message_queue_names(&ctx); -out_restore_lookup_table: - if (num_additional_swms) - unmerge_lookup_table(wim); -out: return ret; } -/* - * Unmounts the WIM file that was previously mounted on @dir by using - * wimlib_mount_image(). - */ +/* API function documented in wimlib.h */ WIMLIBAPI int wimlib_unmount_image(const char *dir, int unmount_flags, wimlib_progress_func_t progress_func) @@ -2649,9 +2635,7 @@ wimlib_unmount_image(const tchar *dir, int unmount_flags, 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) + int mount_flags, const tchar *staging_dir) { return mount_unsupported_error(); }