X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=c130f618c2777deb6f89f4d6d5db26676b7bfe00;hp=b67f40c6faacaec36cbb8e969fabcce36899bb21;hb=f85cfd2a5bee12fabe429cf77430da872c1eef01;hpb=9b1647d673092a6c53a90c1d89831a5131660b9d diff --git a/src/mount.c b/src/mount.c index b67f40c6..c130f618 100644 --- a/src/mount.c +++ b/src/mount.c @@ -53,42 +53,70 @@ /* File descriptor to a file open on the WIM filesystem. */ struct wimlib_fd { - struct inode *inode; - struct lookup_table_entry *lte; + struct inode *f_inode; + struct lookup_table_entry *f_lte; int staging_fd; u16 idx; u32 stream_id; }; -/* The WIMStruct for the mounted WIM. */ -static WIMStruct *w; - -/* Working directory when `imagex mount' is run. */ -static const char *working_directory; - -/* Name of the staging directory for a read-write mount. Whenever a new file is - * created, it is done so in the staging directory. Furthermore, whenever a - * file in the WIM is modified, it is extracted to the staging directory. If - * changes are commited when the WIM is unmounted, the file resources are merged - * in from the staging directory when writing the new WIM. */ -static char *staging_dir_name; -static size_t staging_dir_name_len; - -/* Flags passed to wimlib_mount(). */ -static int mount_flags; +struct wimfs_context { + /* The WIMStruct for the mounted WIM. */ + WIMStruct *wim; + + /* Working directory when `imagex mount' is run. */ + char *working_directory; + + /* Name of the staging directory for a read-write mount. Whenever a new file is + * created, it is done so in the staging directory. Furthermore, whenever a + * file in the WIM is modified, it is extracted to the staging directory. If + * changes are commited when the WIM is unmounted, the file resources are merged + * in from the staging directory when writing the new WIM. */ + char *staging_dir_name; + size_t staging_dir_name_len; + + /* Flags passed to wimlib_mount(). */ + int mount_flags; + + /* Next inode number to be assigned. */ + u64 next_ino; + + /* List of lookup table entries in the staging directory */ + struct list_head staging_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 */ + char *unmount_to_daemon_mq_name; + char *daemon_to_unmount_mq_name; + mqd_t unmount_to_daemon_mq; + mqd_t daemon_to_unmount_mq; +}; -/* Name of the directory on which the WIM file is mounted. */ -static const char *mount_dir; +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); +} -/* Next inode number to be assigned. */ -static u64 next_ino; +static inline struct wimfs_context *wimfs_get_context() +{ + return (struct wimfs_context*)fuse_get_context()->private_data; +} -/* List of lookup table entries in the staging directory */ -static LIST_HEAD(staging_list); +static inline WIMStruct *wimfs_get_WIMStruct() +{ + return wimfs_get_context()->wim; +} -static inline int get_lookup_flags() +static inline int get_lookup_flags(const struct wimfs_context *ctx) { - if (mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS) + if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS) return LOOKUP_FLAG_ADS_OK; else return 0; @@ -100,6 +128,16 @@ static inline int flags_writable(int open_flags) return open_flags & (O_RDWR | O_WRONLY); } +/* + * Allocate a file descriptor for a stream. + * + * @inode: inode containing the stream we're opening + * @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. + * + * 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, @@ -108,16 +146,22 @@ static int alloc_wimlib_fd(struct inode *inode, static const u16 fds_per_alloc = 8; static const u16 max_fds = 0xffff; + 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); + if (inode->num_opened_fds == inode->num_allocated_fds) { struct wimlib_fd **fds; u16 num_new_fds; if (inode->num_allocated_fds == max_fds) return -EMFILE; - num_new_fds = min(fds_per_alloc, max_fds - inode->num_allocated_fds); - - fds = REALLOC(inode->fds, (inode->num_allocated_fds + num_new_fds) * - sizeof(inode->fds[0])); + num_new_fds = min(fds_per_alloc, + max_fds - inode->num_allocated_fds); + + fds = REALLOC(inode->fds, + (inode->num_allocated_fds + num_new_fds) * + sizeof(inode->fds[0])); if (!fds) return -ENOMEM; memset(&fds[inode->num_allocated_fds], 0, @@ -130,15 +174,17 @@ static int alloc_wimlib_fd(struct inode *inode, struct wimlib_fd *fd = CALLOC(1, sizeof(*fd)); if (!fd) return -ENOMEM; - fd->inode = inode; - fd->lte = lte; + 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++; - lte->num_opened_fds++; + if (lte) + lte->num_opened_fds++; + DEBUG("Allocated fd"); return 0; } } @@ -148,7 +194,7 @@ static void inode_put_fd(struct inode *inode, struct wimlib_fd *fd) { wimlib_assert(fd); wimlib_assert(inode); - wimlib_assert(fd->inode == inode); + wimlib_assert(fd->f_inode == inode); wimlib_assert(inode->num_opened_fds); wimlib_assert(fd->idx < inode->num_opened_fds); wimlib_assert(inode->fds[fd->idx] == fd); @@ -162,52 +208,60 @@ static void inode_put_fd(struct inode *inode, struct wimlib_fd *fd) static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd) { wimlib_assert(fd); - wimlib_assert(fd->lte == lte); + wimlib_assert(fd->f_lte == lte); if (!lte) /* Empty stream with no lookup table entry */ return 0; - wimlib_assert(lte->num_opened_fds); + /* Close staging file descriptor if needed. */ - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { - wimlib_assert(lte->staging_file_name); - wimlib_assert(fd->staging_fd != -1); - if (close(fd->staging_fd) != 0) + if (lte->resource_location == RESOURCE_IN_STAGING_FILE + && fd->staging_fd != -1) + { + if (close(fd->staging_fd) != 0) { + ERROR_WITH_ERRNO("Failed to close staging file"); return -errno; + } } - lte_decrement_num_opened_fds(lte, w->lookup_table); + lte_decrement_num_opened_fds(lte); return 0; } +/* Close a file descriptor. */ static int close_wimlib_fd(struct wimlib_fd *fd) { int ret; - ret = lte_put_fd(fd->lte, fd); + wimlib_assert(fd); + 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); + ret = lte_put_fd(fd->f_lte, fd); if (ret != 0) return ret; - inode_put_fd(fd->inode, fd); + inode_put_fd(fd->f_inode, fd); return 0; } -/* Remove a dentry; i.e. remove a reference to the inode. +/* Remove a dentry; i.e. remove a reference to the corresponding inode. * - * If there are no remaining references to the inode either through detnries or - * open file descriptors, the inode is freed. + * 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 + * removed, but the dentry is unlinked and freed. * - * 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. - * - * Otherwise, the inode is not removed, but the dentry is unlinked and freed. */ + * 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. + */ static void remove_dentry(struct dentry *dentry, struct lookup_table *lookup_table) { - struct inode *inode = dentry->inode; + struct inode *inode = dentry->d_inode; struct lookup_table_entry *lte; unsigned i; - for (i = 0; <= inode->num_ads; i++) { + for (i = 0; i <= inode->num_ads; i++) { lte = inode_stream_lte_resolved(inode, i); if (lte) lte_decrement_refcnt(lte, lookup_table); @@ -216,76 +270,6 @@ static void remove_dentry(struct dentry *dentry, put_dentry(dentry); } -/* Remove an alternate data stream from the inode */ -static void inode_remove_ads(struct inode *inode, u16 idx, - struct lookup_table *lookup_table) -{ - struct ads_entry *ads_entry; - struct lookup_table_entry *lte; - - ads_entry = inode->ads_entries[idx]; - - wimlib_assert(ads_entry); - - lte = ads_entry->lte; - - if (lte) - lte_decrement_refcnt(lte, lookup_table); - - free_ads_entry(ads_entry); - - wimlib_assert(inode->num_ads); - memcpy(&inode->ads_entries[idx], - &inode->ads_entries[idx + 1], - (inode->num_ads - idx - 1) * sizeof(inode->ads_entries[0])); - inode->num_ads--; -} - -/* 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. */ -int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte, - struct stat *stbuf) -{ - if (inode_is_symlink(inode)) - stbuf->st_mode = S_IFLNK | 0777; - else if (inode_is_directory(inode)) - stbuf->st_mode = S_IFDIR | 0755; - else - stbuf->st_mode = S_IFREG | 0644; - - 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) { - wimlib_assert(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE); - wimlib_assert(lte->staging_file_name); - 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 = lte->resource_entry.original_size; - } - } 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; - return 0; -} - /* Creates a new staging file and returns its file descriptor opened for * writing. * @@ -294,7 +278,8 @@ int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte, * @return: The file descriptor for the new file. Returns -1 and sets errno on * error, for any reason possible from the creat() function. */ -static int create_staging_file(char **name_ret, int open_flags) +static int create_staging_file(char **name_ret, int open_flags, + struct wimfs_context *ctx) { size_t name_len; char *name; @@ -302,7 +287,7 @@ static int create_staging_file(char **name_ret, int open_flags) int fd; int errno_save; - name_len = staging_dir_name_len + 1 + SHA1_HASH_SIZE; + name_len = ctx->staging_dir_name_len + 1 + SHA1_HASH_SIZE; name = MALLOC(name_len + 1); if (!name) { errno = ENOMEM; @@ -311,9 +296,9 @@ static int create_staging_file(char **name_ret, int open_flags) do { - memcpy(name, staging_dir_name, staging_dir_name_len); - name[staging_dir_name_len] = '/'; - randomize_char_array_with_alnum(name + staging_dir_name_len + 1, + 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); name[name_len] = '\0'; @@ -330,7 +315,7 @@ static int create_staging_file(char **name_ret, int open_flags) DEBUG("Creating staging file `%s'", name); - fd = open(name, open_flags | O_CREAT | O_TRUNC, 0600); + fd = open(name, open_flags | O_CREAT | O_TRUNC, 0600); if (fd == -1) { errno_save = errno; FREE(name); @@ -341,11 +326,14 @@ static int create_staging_file(char **name_ret, int open_flags) return fd; } -/* +/* * Extract a WIM resource to the staging directory. * * @inode: Inode that contains the stream we are extracting * + * @stream_id: Identifier for the stream (it stays constant even if the indices + * of the stream entries are changed) + * * @lte: Pointer to pointer to the lookup table entry for the stream we need to * extract, or NULL if there was no lookup table entry present for the stream * @@ -355,15 +343,19 @@ static int create_staging_file(char **name_ret, int open_flags) static int extract_resource_to_staging_dir(struct inode *inode, u32 stream_id, struct lookup_table_entry **lte, - off_t size) + off_t size, + struct wimfs_context *ctx) { char *staging_file_name; int ret; int fd; struct lookup_table_entry *old_lte, *new_lte; + DEBUG("Extracting resource to staging dir: inode %"PRIu64", " + "stream id %"PRIu32, inode->ino, stream_id); + old_lte = *lte; - fd = create_staging_file(&staging_file_name, O_WRONLY); + fd = create_staging_file(&staging_file_name, O_WRONLY, ctx); if (fd == -1) return -errno; @@ -380,106 +372,146 @@ static int extract_resource_to_staging_dir(struct inode *inode, goto out_delete_staging_file; } - if (old_lte) { - wimlib_assert(old_lte->resource_location == RESOURCE_IN_WIM); - if (inode->link_count == old_lte->refcnt) { - /* The reference count of the existing lookup table - * entry is the same as the size of the hard link group - * associated with the dentry; therefore, ALL the - * references to the lookup table entry correspond to - * the stream we're trying to extract. So the lookup - * table entry can be re-used. - */ - DEBUG("Re-using lookup table entry"); - lookup_table_unlink(w->lookup_table, old_lte); - new_lte = old_lte; - } else { + if (old_lte && inode->link_count == 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 table entry correspond + * to the stream we're trying to extract, so the lookup + * table entry can be re-used. */ + DEBUG("Re-using lookup table entry"); + lookup_table_unlink(ctx->wim->lookup_table, old_lte); + new_lte = old_lte; + } else { + if (old_lte) { + /* There's an existing lookup table entry, but its + * reference count is creater than the link count for + * 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); DEBUG("Splitting lookup table entry " - "(inode->link_count = %zu, lte refcnt = %u)", + "(inode->link_count = %u, old_lte->refcnt = %u)", inode->link_count, old_lte->refcnt); - wimlib_assert(old_lte->refcnt > inode->link_count); + } - new_lte = new_lookup_table_entry(); - if (!new_lte) { - ret = -ENOMEM; - goto out_delete_staging_file; - } - old_lte->refcnt -= inode->link_count; + new_lte = new_lookup_table_entry(); + if (!new_lte) { + ret = -ENOMEM; + goto out_delete_staging_file; + } - for (u16 i = 0, j = 0; j < inode->num_opened_fds; i++) { - if (inode->fds[i]) { - if (inode->fds[i]->stream_id == stream_id) { - wimlib_assert(inode->fds[i]->lte == old_lte); - inode->fds[i]->lte = new_lte; + /* There may already be open file descriptors to this stream if + * it's previously been opened read-only, but just now we're + * opening it read-write. Identify those file descriptors and + * change their lookup table entry pointers to point to the new + * lookup table entry, and open staging file descriptors for + * them. + * + * At the same time, we need to count the number of these opened + * 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]; + if (fd) { + if (fd->stream_id == stream_id) { + wimlib_assert(fd->f_lte == old_lte); + wimlib_assert(fd->staging_fd == -1); + fd->f_lte = new_lte; + new_lte->num_opened_fds++; + fd->staging_fd = open(staging_file_name, O_RDONLY); + if (fd->staging_fd == -1) { + ret = -errno; + goto out_revert_fd_changes; } - j++; } + j++; } } - } else { - /* No old_lte was supplied, so the resource had no lookup table - * entry before (it must be an empty resource) */ - wimlib_assert(inode->num_opened_fds == 0); - new_lte = new_lookup_table_entry(); - if (!new_lte) { - ret = -ENOMEM; - goto out_delete_staging_file; + DEBUG("%hu fd's were already opened to the file we extracted", + new_lte->num_opened_fds); + if (old_lte) { + old_lte->num_opened_fds -= new_lte->num_opened_fds; + old_lte->refcnt -= inode->link_count; } } + new_lte->resource_entry.original_size = size; - new_lte->refcnt = inode->link_count; + 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); - new_lte->staging_file_name = staging_file_name; - new_lte->resource_location = RESOURCE_IN_STAGING_FILE; - lookup_table_insert(w->lookup_table, new_lte); - list_add(&new_lte->staging_list, &staging_list); + 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); *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]; + 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; + } + j++; + } + } + free_lookup_table_entry(new_lte); out_delete_staging_file: unlink(staging_file_name); FREE(staging_file_name); return ret; } -/* +/* * Creates a randomly named staging directory and returns its name into the * static variable staging_dir_name. * * If the staging directory cannot be created, staging_dir_name is set to NULL. * */ -static void make_staging_dir() +static int make_staging_dir(struct wimfs_context *ctx) { /* XXX Give the user an option of where to stage files */ - static char prefix[] = "wimlib-staging-"; - static const size_t prefix_len = 15; - static const size_t suffix_len = 10; + static const char prefix[] = "wimlib-staging-"; + static const size_t prefix_len = sizeof(prefix) - 1; + static const size_t random_suffix_len = 10; - size_t pwd_len = strlen(working_directory); + size_t pwd_len = strlen(ctx->working_directory); - staging_dir_name_len = pwd_len + 1 + prefix_len + suffix_len; + ctx->staging_dir_name_len = pwd_len + 1 + prefix_len + random_suffix_len; - staging_dir_name = MALLOC(staging_dir_name_len + 1); - if (!staging_dir_name) { - ERROR("Out of memory"); - return; - } + ctx->staging_dir_name = MALLOC(ctx->staging_dir_name_len + 1); + if (!ctx->staging_dir_name) + return WIMLIB_ERR_NOMEM; - memcpy(staging_dir_name, working_directory, pwd_len); - staging_dir_name[pwd_len] = '/'; - memcpy(staging_dir_name + pwd_len + 1, prefix, prefix_len); - randomize_char_array_with_alnum(staging_dir_name + pwd_len + 1 + prefix_len, - suffix_len); - staging_dir_name[staging_dir_name_len] = '\0'; + memcpy(ctx->staging_dir_name, ctx->working_directory, pwd_len); + ctx->staging_dir_name[pwd_len] = '/'; + memcpy(ctx->staging_dir_name + pwd_len + 1, prefix, prefix_len); + randomize_char_array_with_alnum(ctx->staging_dir_name + pwd_len + + 1 + prefix_len, random_suffix_len); + ctx->staging_dir_name[ctx->staging_dir_name_len] = '\0'; - if (mkdir(staging_dir_name, 0700) != 0) { + if (mkdir(ctx->staging_dir_name, 0700) != 0) { ERROR_WITH_ERRNO("Failed to create temporary directory `%s'", - staging_dir_name); - FREE(staging_dir_name); - staging_dir_name = NULL; + ctx->staging_dir_name); + FREE(ctx->staging_dir_name); + ctx->staging_dir_name = NULL; + return WIMLIB_ERR_MKDIR; } + return 0; } static int remove_file_or_directory(const char *fpath, const struct stat *sb, @@ -487,36 +519,30 @@ static int remove_file_or_directory(const char *fpath, const struct stat *sb, { if (remove(fpath) == 0) return 0; - else + else { + ERROR_WITH_ERRNO("Cannot remove `%s'", fpath); return WIMLIB_ERR_DELETE_STAGING_DIR; + } } -/* - * Deletes the staging directory and all the files contained in it. +/* + * Deletes the staging directory and all the files contained in it. */ -static int delete_staging_dir() +static int delete_staging_dir(struct wimfs_context *ctx) { int ret; - - ret = nftw(staging_dir_name, remove_file_or_directory,10, FTW_DEPTH); - staging_dir_name = NULL; + wimlib_assert(ctx->staging_dir_name != NULL); + ret = nftw(ctx->staging_dir_name, remove_file_or_directory, + 10, FTW_DEPTH); + FREE(ctx->staging_dir_name); + ctx->staging_dir_name = NULL; return ret; } -/* 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 */ -static char *unmount_to_daemon_mq_name; -static char *daemon_to_unmount_mq_name; -static mqd_t unmount_to_daemon_mq; -static mqd_t daemon_to_unmount_mq; /* Simple function that returns the concatenation of 4 strings. */ -static char *strcat_dup(const char *s1, const char *s2, const char *s3, +static char *strcat_dup(const char *s1, const char *s2, const char *s3, const char *s4) { size_t len = strlen(s1) + strlen(s2) + strlen(s3) + strlen(s4) + 1; @@ -551,17 +577,8 @@ static void s_slashes_underscores_g(char *s) } } -/* - * Opens two POSIX message queue: one for sending messages from the unmount - * process to the daemon process, and one to go the other way. The names of the - * message queues, which must be system-wide unique, are be based on the mount - * point. (There of course is still a possibility of a collision if one were to - * unmount two identically named directories simultaneously...) - * - * @daemon specifies whether the calling process is the filesystem daemon or the - * unmount process. - */ -static int open_message_queues(bool daemon) +static int set_message_queue_names(struct wimfs_context *ctx, + const char *mount_dir) { static const char *slash = "/"; static const char *prefix = "wimlib-"; @@ -569,40 +586,67 @@ static int open_message_queues(bool daemon) static const char *d2u_suffix = "daemon-to-unmount-mq"; const char *mount_dir_basename = path_basename(mount_dir); - int flags; - int ret; - unmount_to_daemon_mq_name = strcat_dup(slash, mount_dir_basename, - prefix, u2d_suffix); - if (!unmount_to_daemon_mq_name) { + ctx->unmount_to_daemon_mq_name = strcat_dup(slash, mount_dir_basename, + prefix, u2d_suffix); + if (!ctx->unmount_to_daemon_mq_name) { ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } - daemon_to_unmount_mq_name = strcat_dup(slash, mount_dir_basename, - prefix, d2u_suffix); - if (!daemon_to_unmount_mq_name) { + ctx->daemon_to_unmount_mq_name = strcat_dup(slash, mount_dir_basename, + prefix, d2u_suffix); + if (!ctx->daemon_to_unmount_mq_name) { ERROR("Out of memory"); - ret = WIMLIB_ERR_NOMEM; - goto err1; + FREE(ctx->unmount_to_daemon_mq_name); + ctx->unmount_to_daemon_mq_name = NULL; + return WIMLIB_ERR_NOMEM; } - remove_trailing_slashes(unmount_to_daemon_mq_name); - remove_trailing_slashes(daemon_to_unmount_mq_name); - s_slashes_underscores_g(unmount_to_daemon_mq_name + 1); - s_slashes_underscores_g(daemon_to_unmount_mq_name + 1); + remove_trailing_slashes(ctx->unmount_to_daemon_mq_name); + remove_trailing_slashes(ctx->daemon_to_unmount_mq_name); + s_slashes_underscores_g(ctx->unmount_to_daemon_mq_name + 1); + s_slashes_underscores_g(ctx->daemon_to_unmount_mq_name + 1); + return 0; +} + +static void free_message_queue_names(struct wimfs_context *ctx) +{ + FREE(ctx->unmount_to_daemon_mq_name); + FREE(ctx->daemon_to_unmount_mq_name); + ctx->unmount_to_daemon_mq_name = NULL; + ctx->daemon_to_unmount_mq_name = NULL; +} + +/* + * Opens two POSIX message queue: one for sending messages from the unmount + * process to the daemon process, and one to go the other way. The names of the + * message queues, which must be system-wide unique, are be based on the mount + * point. (There of course is still a possibility of a collision if one were to + * unmount two identically named directories simultaneously...) + * + * @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) +{ + int flags; + int ret; + + wimlib_assert(ctx->unmount_to_daemon_mq_name != NULL && + ctx->daemon_to_unmount_mq_name != NULL); if (daemon) flags = O_RDONLY | O_CREAT; else flags = O_WRONLY | O_CREAT; - unmount_to_daemon_mq = mq_open(unmount_to_daemon_mq_name, flags, - 0700, NULL); + ctx->unmount_to_daemon_mq = mq_open(ctx->unmount_to_daemon_mq_name, + flags, 0700, NULL); - if (unmount_to_daemon_mq == (mqd_t)-1) { + if (ctx->unmount_to_daemon_mq == (mqd_t)-1) { ERROR_WITH_ERRNO("mq_open()"); ret = WIMLIB_ERR_MQUEUE; - goto err2; + goto out; } if (daemon) @@ -610,40 +654,42 @@ static int open_message_queues(bool daemon) else flags = O_RDONLY | O_CREAT; - daemon_to_unmount_mq = mq_open(daemon_to_unmount_mq_name, flags, - 0700, NULL); + ctx->daemon_to_unmount_mq = mq_open(ctx->daemon_to_unmount_mq_name, + flags, 0700, NULL); - if (daemon_to_unmount_mq == (mqd_t)-1) { + if (ctx->daemon_to_unmount_mq == (mqd_t)-1) { ERROR_WITH_ERRNO("mq_open()"); ret = WIMLIB_ERR_MQUEUE; - goto err3; + goto out_close_unmount_to_daemon_mq; } - return 0; -err3: - mq_close(unmount_to_daemon_mq); - mq_unlink(unmount_to_daemon_mq_name); -err2: - FREE(daemon_to_unmount_mq_name); -err1: - FREE(unmount_to_daemon_mq_name); + ret = 0; + goto out; +out_close_unmount_to_daemon_mq: + mq_close(ctx->unmount_to_daemon_mq); + mq_unlink(ctx->unmount_to_daemon_mq_name); + ctx->unmount_to_daemon_mq = (mqd_t)-1; +out: return ret; } -static int mq_get_msgsize(mqd_t mq) +/* 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 const char *msgsize_max_file = "/proc/sys/fs/mqueue/msgsize_max"; FILE *fp; struct mq_attr attr; - int msgsize; + long msgsize; - if (mq_getattr(unmount_to_daemon_mq, &attr) == 0) { + if (mq_getattr(mq, &attr) == 0) { msgsize = attr.mq_msgsize; } else { ERROR_WITH_ERRNO("mq_getattr()"); ERROR("Attempting to read %s", msgsize_max_file); fp = fopen(msgsize_max_file, "rb"); if (fp) { - if (fscanf(fp, "%d", &msgsize) != 1) { + if (fscanf(fp, "%ld", &msgsize) != 1) { ERROR("Assuming message size of 8192"); msgsize = 8192; } @@ -658,65 +704,67 @@ static int mq_get_msgsize(mqd_t mq) return msgsize; } -/* Closes the message queues, which are allocated in static variables */ -static void close_message_queues() +static int get_mailbox(mqd_t mq, long needed_msgsize, long *msgsize_ret, + char **mailbox_ret) { - mq_close(unmount_to_daemon_mq); - mq_close(daemon_to_unmount_mq); - mq_unlink(unmount_to_daemon_mq_name); - mq_unlink(daemon_to_unmount_mq_name); -} + long msgsize; + char *mailbox; -static int wimfs_access(const char *path, int mask) -{ - /* XXX Permissions not implemented */ + msgsize = mq_get_msgsize(mq); + + if (msgsize < needed_msgsize) { + ERROR("Message queue max size must be at least %ld!", + needed_msgsize); + return WIMLIB_ERR_MQUEUE; + } + + mailbox = MALLOC(msgsize); + if (!mailbox) { + ERROR("Failed to allocate %ld bytes for mailbox", msgsize); + return WIMLIB_ERR_NOMEM; + } + *msgsize_ret = msgsize; + *mailbox_ret = mailbox; return 0; } -#if 0 -/* Closes the staging file descriptor associated with the lookup table entry, if - * it is opened. */ -static int close_lte_fds(struct lookup_table_entry *lte) +static void unlink_message_queues(struct wimfs_context *ctx) { - for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) { - if (lte->fds[i] && lte->fds[i]->staging_fd != -1) { - wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE); - wimlib_assert(lte->staging_file_name); - if (close(lte->fds[i]->staging_fd) != 0) { - ERROR_WITH_ERRNO("Failed close file `%s'", - lte->staging_file_name); - return WIMLIB_ERR_WRITE; - } - j++; - } - } - return 0; + mq_unlink(ctx->unmount_to_daemon_mq_name); + mq_unlink(ctx->daemon_to_unmount_mq_name); } -static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, - struct lookup_table_entry *newptr) +/* Closes the message queues, which are allocated in static variables */ +static void close_message_queues(struct wimfs_context *ctx) { - struct list_head *pos; - struct stream_list_head *head; - list_for_each(pos, <e->lte_group_list) { - head = container_of(pos, struct stream_list_head, list); - if (head->type == STREAM_TYPE_ADS) { - struct ads_entry *ads_entry; - ads_entry = container_of(head, struct ads_entry, lte_group_list); - - ads_entry->lte = newptr; - } else { - wimlib_assert(head->type == STREAM_TYPE_NORMAL); + mq_close(ctx->unmount_to_daemon_mq); + ctx->unmount_to_daemon_mq = (mqd_t)(-1); + mq_close(ctx->daemon_to_unmount_mq); + ctx->daemon_to_unmount_mq = (mqd_t)(-1); + unlink_message_queues(ctx); +} - struct dentry *dentry; - dentry = container_of(head, struct dentry, lte_group_list); +static int wimfs_access(const char *path, int mask) +{ + /* Permissions not implemented */ + return 0; +} - dentry->lte = newptr; +static void inode_update_lte_ptr(struct inode *inode, + struct lookup_table_entry *old_lte, + struct lookup_table_entry *new_lte) +{ + 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; + } } } } -#endif - static int update_lte_of_staging_file(struct lookup_table_entry *lte, struct lookup_table *table) @@ -739,54 +787,66 @@ static int update_lte_of_staging_file(struct lookup_table_entry *lte, if (duplicate_lte) { /* Merge duplicate lookup table entries */ - -#if 0 - lte_list_change_lte_ptr(lte, duplicate_lte); -#endif duplicate_lte->refcnt += lte->refcnt; -#if 0 - list_splice(<e->lte_group_list, - &duplicate_lte->lte_group_list); -#endif - + list_del(<e->staging_list); + 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; } - wimlib_assert(<e->file_on_disk == <e->staging_file_name); - lte->resource_location = RESOURCE_IN_FILE_ON_DISK; - copy_hash(lte->hash, hash); - lte->resource_entry.original_size = stbuf.st_size; - lte->resource_entry.size = stbuf.st_size; - lookup_table_insert(table, lte); + 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(<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->lte_inode = 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; + for (u16 i = 0, j = 0; j < num_opened_fds; i++) { + struct wimlib_fd *fd = inode->fds[i]; + if (fd) { + wimlib_assert(fd->f_inode == inode); + int ret = close_wimlib_fd(fd); + if (ret != 0) + return ret; + j++; + } + } return 0; } /* Overwrites the WIM file, with changes saved. */ -static int rebuild_wim(WIMStruct *w, bool check_integrity) +static int rebuild_wim(struct wimfs_context *ctx, bool check_integrity) { int ret; struct lookup_table_entry *lte, *tmp; + WIMStruct *w = ctx->wim; + - /* Close all the staging file descriptors. */ -#if 0 DEBUG("Closing all staging file descriptors."); - list_for_each_entry(lte, &staging_list, staging_list) { - ret = close_lte_fds(lte); + list_for_each_entry(lte, &ctx->staging_list, staging_list) { + ret = inode_close_fds(lte->lte_inode); if (ret != 0) return ret; } -#endif - /* Calculate SHA1 checksums for all staging files, and merge unnecessary - * lookup table entries. */ DEBUG("Calculating SHA1 checksums for all new staging files."); - list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) { - ret = update_lte_of_staging_file(lte, w->lookup_table); + list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) { + ret = update_lte_of_staging_file(lte, ctx->wim->lookup_table); if (ret != 0) return ret; } @@ -810,7 +870,7 @@ static void wimfs_destroy(void *p) * through a message queue that indicates whether the --commit * option was specified or not. */ - int msgsize; + long msgsize; struct timespec timeout; struct timeval now; ssize_t bytes_received; @@ -818,15 +878,14 @@ static void wimfs_destroy(void *p) char commit; char check_integrity; char status; + char *mailbox; + struct wimfs_context *ctx = wimfs_get_context(); - ret = open_message_queues(true); - if (ret != 0) - exit(1); + if (open_message_queues(ctx, true)) + return; - msgsize = mq_get_msgsize(unmount_to_daemon_mq); - char msg[msgsize]; - msg[0] = 0; - msg[1] = 0; + if (get_mailbox(ctx->unmount_to_daemon_mq, 2, &msgsize, &mailbox)) + goto out_close_message_queues; /* Wait at most 3 seconds before giving up and discarding changes. */ gettimeofday(&now, NULL); @@ -835,48 +894,46 @@ static void wimfs_destroy(void *p) DEBUG("Waiting for message telling us whether to commit or not, and " "whether to include integrity checks."); - bytes_received = mq_timedreceive(unmount_to_daemon_mq, msg, + bytes_received = mq_timedreceive(ctx->unmount_to_daemon_mq, mailbox, msgsize, NULL, &timeout); - commit = msg[0]; - check_integrity = msg[1]; if (bytes_received == -1) { - if (errno == ETIMEDOUT) { - ERROR("Timed out."); - } else { - ERROR_WITH_ERRNO("mq_timedreceive()"); - } + ERROR_WITH_ERRNO("mq_timedreceive()"); ERROR("Not committing."); + commit = 0; + check_integrity = 0; } else { - DEBUG("Received message: [%d %d]", msg[0], msg[1]); + DEBUG("Received message: [%d %d]", mailbox[0], mailbox[1]); + commit = mailbox[0]; + check_integrity = mailbox[1]; } status = 0; - if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { + if (ctx->mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { if (commit) { - status = chdir(working_directory); - if (status != 0) { + ret = chdir(ctx->working_directory); + if (ret == 0) { + status = rebuild_wim(ctx, (check_integrity != 0)); + } else { ERROR_WITH_ERRNO("chdir()"); status = WIMLIB_ERR_NOTDIR; - goto done; } - status = rebuild_wim(w, (check_integrity != 0)); } - ret = delete_staging_dir(); + ret = delete_staging_dir(ctx); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to delete the staging " - "directory"); + ERROR("Failed to delete the staging directory"); if (status == 0) status = ret; } } else { DEBUG("Read-only mount"); } -done: - DEBUG("Sending status %u", status); - ret = mq_send(daemon_to_unmount_mq, &status, 1, 1); + DEBUG("Sending status %hhd", status); + ret = mq_send(ctx->daemon_to_unmount_mq, &status, 1, 1); if (ret == -1) ERROR_WITH_ERRNO("Failed to send status to unmount process"); - close_message_queues(); + FREE(mailbox); +out_close_message_queues: + close_message_queues(ctx); } #if 0 @@ -888,13 +945,14 @@ static int wimfs_fallocate(const char *path, int mode, return fallocate(fd->staging_fd, mode, offset, len); } +#endif + 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; - return dentry_to_stbuf(fd->dentry, stbuf); + return inode_to_stbuf(fd->f_inode, fd->f_lte, stbuf); } -#endif static int wimfs_ftruncate(const char *path, off_t size, struct fuse_file_info *fi) @@ -903,7 +961,8 @@ static int wimfs_ftruncate(const char *path, off_t size, int ret = ftruncate(fd->staging_fd, size); if (ret != 0) return ret; - fd->lte->resource_entry.original_size = size; + if (fd->f_lte && size < fd->f_lte->resource_entry.original_size) + fd->f_lte->resource_entry.original_size = size; return 0; } @@ -915,13 +974,14 @@ static int wimfs_getattr(const char *path, struct stat *stbuf) struct dentry *dentry; struct lookup_table_entry *lte; int ret; + struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(w, path, - get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK, + ret = lookup_resource(ctx->wim, path, + get_lookup_flags(ctx) | LOOKUP_FLAG_DIRECTORY_OK, &dentry, <e, NULL); if (ret != 0) return ret; - return inode_to_stbuf(dentry->inode, lte, stbuf); + return inode_to_stbuf(dentry->d_inode, lte, stbuf); } #ifdef ENABLE_XATTR @@ -930,22 +990,24 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, size_t size) { int ret; - struct dentry *dentry; + struct inode *inode; struct ads_entry *ads_entry; size_t res_size; struct lookup_table_entry *lte; + struct wimfs_context *ctx = wimfs_get_context(); - if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) return -ENOATTR; name += 5; - dentry = get_dentry(w, path); - if (!dentry) + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) return -ENOENT; - ads_entry = inode_get_ads_entry(dentry->inode, name, NULL); + + ads_entry = inode_get_ads_entry(inode, name, NULL); if (!ads_entry) return -ENOATTR; @@ -954,11 +1016,14 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, if (size == 0) return res_size; + if (res_size > size) return -ERANGE; + ret = read_full_wim_resource(lte, (u8*)value); if (ret != 0) return -EIO; + return res_size; } #endif @@ -966,18 +1031,16 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, /* Create a hard link */ static int wimfs_link(const char *to, const char *from) { - struct dentry *to_dentry, *from_dentry, *from_dentry_parent; + struct dentry *from_dentry, *from_dentry_parent; const char *link_name; struct inode *inode; - unsigned i; struct lookup_table_entry *lte; + WIMStruct *w = wimfs_get_WIMStruct(); - to_dentry = get_dentry(w, to); - if (!to_dentry) + inode = wim_pathname_to_inode(w, to); + if (!inode) return -ENOENT; - inode = to_dentry->inode; - if (!inode_is_regular_file(inode)) return -EPERM; @@ -996,10 +1059,10 @@ static int wimfs_link(const char *to, const char *from) inode_add_dentry(from_dentry, inode); - from_dentry->inode = inode; + from_dentry->d_inode = inode; inode->link_count++; - for (i = 0; i <= inode->num_ads; i++) { + for (unsigned i = 0; i <= inode->num_ads; i++) { lte = inode_stream_lte_resolved(inode, i); if (lte) lte->refcnt++; @@ -1012,34 +1075,32 @@ static int wimfs_link(const char *to, const char *from) #ifdef ENABLE_XATTR static int wimfs_listxattr(const char *path, char *list, size_t size) { - struct dentry *dentry; - int ret; - char *p = list; size_t needed_size; - unsigned i; struct inode *inode; - if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + struct wimfs_context *ctx = wimfs_get_context(); + + if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; /* List alternate data streams, or get the list size */ - ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL); - if (ret != 0) - return ret; - inode = dentry->inode; + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) + return -ENOENT; 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; + for (u16 i = 0; i < inode->num_ads; i++) + needed_size += inode->ads_entries[i].stream_name_utf8_len + 6; return needed_size; } else { - for (i = 0; i < inode->num_ads; i++) { - needed_size = inode->ads_entries[i]->stream_name_utf8_len + 6; + char *p = list; + for (u16 i = 0; i < inode->num_ads; i++) { + needed_size = inode->ads_entries[i].stream_name_utf8_len + 6; if (needed_size > size) return -ERANGE; p += sprintf(p, "user.%s", - inode->ads_entries[i]->stream_name_utf8) + 1; + inode->ads_entries[i].stream_name_utf8) + 1; size -= needed_size; } return p - list; @@ -1047,8 +1108,8 @@ static int wimfs_listxattr(const char *path, char *list, size_t size) } #endif -/* - * Create a directory in the WIM. +/* + * Create a directory in the WIM. * @mode is currently ignored. */ static int wimfs_mkdir(const char *path, mode_t mode) @@ -1056,8 +1117,9 @@ static int wimfs_mkdir(const char *path, mode_t mode) struct dentry *parent; struct dentry *newdir; const char *basename; - - parent = get_parent_dentry(w, path); + struct wimfs_context *ctx = wimfs_get_context(); + + parent = get_parent_dentry(ctx->wim, path); if (!parent) return -ENOENT; @@ -1069,36 +1131,38 @@ static int wimfs_mkdir(const char *path, mode_t mode) return -EEXIST; newdir = new_dentry_with_inode(basename); - newdir->inode->attributes |= FILE_ATTRIBUTE_DIRECTORY; - newdir->inode->resolved = true; - newdir->inode->ino = next_ino++; + newdir->d_inode->attributes |= FILE_ATTRIBUTE_DIRECTORY; + newdir->d_inode->resolved = true; + newdir->d_inode->ino = ctx->next_ino++; link_dentry(newdir, parent); return 0; } - /* Creates a regular file. */ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) { const char *stream_name; - if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS) + struct wimfs_context *ctx = wimfs_get_context(); + if ((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 dentry *dentry; + struct inode *inode; char *p = (char*)stream_name - 1; wimlib_assert(*p == ':'); *p = '\0'; - dentry = get_dentry(w, path); - if (!dentry || !dentry_is_regular_file(dentry)) + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) + return -ENOENT; + if (!inode_is_regular_file(inode)) return -ENOENT; - if (inode_get_ads_entry(dentry->inode, stream_name, NULL)) + if (inode_get_ads_entry(inode, stream_name, NULL)) return -EEXIST; - new_entry = inode_add_ads(dentry->inode, stream_name); + new_entry = inode_add_ads(inode, stream_name); if (!new_entry) - return -ENOENT; + return -ENOMEM; } else { struct dentry *dentry, *parent; const char *basename; @@ -1107,7 +1171,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) /* Make sure that the parent of @path exists and is a directory, and * that the dentry named by @path does not already exist. */ - parent = get_parent_dentry(w, path); + parent = get_parent_dentry(ctx->wim, path); if (!parent) return -ENOENT; if (!dentry_is_directory(parent)) @@ -1120,8 +1184,8 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) dentry = new_dentry_with_inode(basename); if (!dentry) return -ENOMEM; - dentry->inode->resolved = true; - dentry->inode->ino = next_ino++; + dentry->d_inode->resolved = true; + dentry->d_inode->ino = ctx->next_ino++; link_dentry(dentry, parent); } return 0; @@ -1138,18 +1202,19 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) struct inode *inode; u16 stream_idx; u32 stream_id; + struct wimfs_context *ctx = wimfs_get_context(); - ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e, - &stream_idx); + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; - inode = dentry->inode; + inode = dentry->d_inode; if (stream_idx == 0) stream_id = 0; else - stream_id = inode->ads_entries[stream_idx - 1]->stream_id; + stream_id = inode->ads_entries[stream_idx - 1].stream_id; /* 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 @@ -1157,11 +1222,12 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) * we can read the file resource directly from the WIM file if we are * opening it read-only, but we need to extract the resource to the * staging directory if we are opening it writable. */ + if (flags_writable(fi->flags) && - lte->resource_location != RESOURCE_IN_STAGING_FILE) { + (!lte || lte->resource_location != RESOURCE_IN_STAGING_FILE)) { + u64 size = (lte) ? wim_resource_size(lte) : 0; ret = extract_resource_to_staging_dir(inode, stream_id, - <e, - wim_resource_size(lte)); + <e, size, ctx); if (ret != 0) return ret; } @@ -1170,7 +1236,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) if (ret != 0) return ret; - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + if (lte && lte->resource_location == RESOURCE_IN_STAGING_FILE) { fd->staging_fd = open(lte->staging_file_name, fi->flags); if (fd->staging_fd == -1) { close_wimlib_fd(fd); @@ -1184,17 +1250,14 @@ 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) { - struct dentry *dentry; struct inode *inode; int ret; struct wimlib_fd *fd = NULL; - - dentry = get_dentry(w, path); - if (!dentry) - return -ENOENT; - - inode = dentry->inode; + struct wimfs_context *ctx = wimfs_get_context(); + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) + return -ENOENT; if (!inode_is_directory(inode)) return -ENOTDIR; ret = alloc_wimlib_fd(inode, 0, NULL, &fd); @@ -1204,9 +1267,9 @@ 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. + * 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, +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; @@ -1214,13 +1277,13 @@ static int wimfs_read(const char *path, char *buf, size_t size, if (!fd) return -EBADF; - if (!fd->lte) /* Empty stream with no lookup table entry */ + if (!fd->f_lte) /* Empty stream with no lookup table entry */ return 0; - if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) { + if (fd->f_lte->resource_location == RESOURCE_IN_STAGING_FILE) { /* Read from staging file */ - wimlib_assert(fd->lte->staging_file_name); + wimlib_assert(fd->f_lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); ssize_t ret; @@ -1235,14 +1298,14 @@ static int wimfs_read(const char *path, char *buf, size_t size, } else { /* Read from WIM */ - u64 res_size = wim_resource_size(fd->lte); - + 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->lte, (u8*)buf, + if (read_wim_resource(fd->f_lte, (u8*)buf, size, offset, false) != 0) return -EIO; return size; @@ -1251,7 +1314,7 @@ static int wimfs_read(const char *path, char *buf, size_t size, /* 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, +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; @@ -1261,7 +1324,7 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, if (!fd) return -EBADF; - inode = fd->inode; + inode = fd->f_inode; filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); @@ -1282,14 +1345,15 @@ 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) { - struct dentry *dentry = get_dentry(w, path); + struct wimfs_context *ctx = wimfs_get_context(); + struct inode *inode = wim_pathname_to_inode(ctx->wim, path); int ret; - if (!dentry) + if (!inode) return -ENOENT; - if (!dentry_is_symlink(dentry)) + if (!inode_is_symlink(inode)) return -EINVAL; - ret = inode_readlink(dentry->inode, buf, buf_len, w); + ret = inode_readlink(inode, buf, buf_len, ctx->wim); if (ret > 0) ret = 0; return ret; @@ -1299,14 +1363,13 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len) static int wimfs_release(const char *path, struct fuse_file_info *fi) { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; - wimlib_assert(fd); return close_wimlib_fd(fd); } +/* Close a directory */ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi) { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; - wimlib_assert(fd); return close_wimlib_fd(fd); } @@ -1314,24 +1377,26 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi) /* Remove an alternate data stream through the XATTR interface */ static int wimfs_removexattr(const char *path, const char *name) { - struct dentry *dentry; + struct inode *inode; struct ads_entry *ads_entry; u16 ads_idx; - if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + 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) return -ENOATTR; name += 5; - dentry = get_dentry(w, path); - if (!dentry) + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) return -ENOENT; - ads_entry = inode_get_ads_entry(dentry->inode, name, &ads_idx); + ads_entry = inode_get_ads_entry(inode, name, &ads_idx); if (!ads_entry) return -ENOATTR; - inode_remove_ads(dentry->inode, ads_idx, w->lookup_table); + inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table); return 0; } #endif @@ -1344,11 +1409,12 @@ static int wimfs_rename(const char *from, const char *to) 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; @@ -1377,7 +1443,7 @@ static int wimfs_rename(const char *from, const char *to) * directory */ if (!dentry_is_directory(dst)) return -ENOTDIR; - if (dst->inode->children != NULL) + if (dst->d_inode->children != NULL) return -ENOTEMPTY; } parent_of_dst = dst->parent; @@ -1408,7 +1474,8 @@ static int wimfs_rename(const char *from, const char *to) static int wimfs_rmdir(const char *path) { struct dentry *dentry; - + WIMStruct *w = wimfs_get_WIMStruct(); + dentry = get_dentry(w, path); if (!dentry) return -ENOENT; @@ -1425,7 +1492,6 @@ static int wimfs_rmdir(const char *path) static int wimfs_setxattr(const char *path, const char *name, const char *value, size_t size, int flags) { - struct dentry *dentry; struct ads_entry *existing_ads_entry; struct ads_entry *new_ads_entry; struct lookup_table_entry *existing_lte; @@ -1433,35 +1499,35 @@ static int wimfs_setxattr(const char *path, const char *name, struct inode *inode; u8 value_hash[SHA1_HASH_SIZE]; u16 ads_idx; + struct wimfs_context *ctx = wimfs_get_context(); - if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) + if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0) return -ENOATTR; name += 5; - dentry = get_dentry(w, path); - if (!dentry) + inode = wim_pathname_to_inode(ctx->wim, path); + if (!inode) return -ENOENT; - inode = dentry->inode; existing_ads_entry = inode_get_ads_entry(inode, name, &ads_idx); if (existing_ads_entry) { if (flags & XATTR_CREATE) return -EEXIST; - inode_remove_ads(dentry->inode, ads_idx, w->lookup_table); + inode_remove_ads(inode, ads_idx, ctx->wim->lookup_table); } else { if (flags & XATTR_REPLACE) return -ENOATTR; } - new_ads_entry = inode_add_ads(dentry, name); + 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(w->lookup_table, value_hash); + existing_lte = __lookup_resource(ctx->wim->lookup_table, value_hash); if (existing_lte) { lte = existing_lte; @@ -1483,7 +1549,7 @@ static int wimfs_setxattr(const char *path, const char *name, lte->resource_entry.size = size; lte->resource_entry.flags = 0; copy_hash(lte->hash, value_hash); - lookup_table_insert(w->lookup_table, lte); + lookup_table_insert(ctx->wim->lookup_table, lte); } new_ads_entry->lte = lte; return 0; @@ -1494,9 +1560,10 @@ static int wimfs_symlink(const char *to, const char *from) { struct dentry *dentry_parent, *dentry; const char *link_name; - struct lookup_table_entry *lte; - - dentry_parent = get_parent_dentry(w, from); + struct inode *inode; + struct wimfs_context *ctx = wimfs_get_context(); + + dentry_parent = get_parent_dentry(ctx->wim, from); if (!dentry_parent) return -ENOENT; if (!dentry_is_directory(dentry_parent)) @@ -1506,24 +1573,19 @@ static int wimfs_symlink(const char *to, const char *from) if (get_dentry_child_with_name(dentry_parent, link_name)) return -EEXIST; - dentry = new_dentry(link_name); + dentry = new_dentry_with_inode(link_name); if (!dentry) return -ENOMEM; + inode = dentry->d_inode; - dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; - dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - dentry->link_group_id = next_link_group_id++; + inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT; + inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + inode->ino = ctx->next_ino++; + inode->resolved = true; - if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0) + if (inode_set_symlink(inode, to, ctx->wim->lookup_table, NULL) != 0) goto out_free_dentry; - wimlib_assert(lte); - - dentry->ads_entries[1].lte_group_list.type = STREAM_TYPE_ADS; - list_add(&dentry->ads_entries[1].lte_group_list.list, - <e->lte_group_list); - wimlib_assert(dentry->resolved); - link_dentry(dentry, dentry_parent); return 0; out_free_dentry: @@ -1538,10 +1600,13 @@ static int wimfs_truncate(const char *path, off_t size) struct dentry *dentry; struct lookup_table_entry *lte; int ret; - unsigned stream_idx; - - ret = lookup_resource(w, path, get_lookup_flags(), &dentry, - <e, &stream_idx); + u16 stream_idx; + u32 stream_id; + struct inode *inode; + struct wimfs_context *ctx = wimfs_get_context(); + + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; @@ -1549,6 +1614,13 @@ static int wimfs_truncate(const char *path, off_t size) if (!lte) /* Already a zero-length file */ 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) { wimlib_assert(lte->staging_file_name); ret = truncate(lte->staging_file_name, size); @@ -1559,8 +1631,8 @@ static int wimfs_truncate(const char *path, off_t size) wimlib_assert(lte->resource_location == RESOURCE_IN_WIM); /* File in WIM. Extract it to the staging directory, but only * the first @size bytes of it. */ - ret = extract_resource_to_staging_dir(dentry, stream_idx, - <e, size); + ret = extract_resource_to_staging_dir(inode, stream_id, + <e, size, ctx); } return ret; } @@ -1570,27 +1642,27 @@ static int wimfs_unlink(const char *path) { struct dentry *dentry; struct lookup_table_entry *lte; - struct inode *inode; int ret; - unsigned stream_idx; - unsigned i; - - ret = lookup_resource(w, path, get_lookup_flags(), &dentry, - <e, &stream_idx); + u16 stream_idx; + struct wimfs_context *ctx = wimfs_get_context(); + + ret = lookup_resource(ctx->wim, path, get_lookup_flags(ctx), + &dentry, <e, &stream_idx); if (ret != 0) return ret; if (stream_idx == 0) - remove_dentry(dentry, w->lookup_table); + remove_dentry(dentry, ctx->wim->lookup_table); else - inode_remove_ads(dentry->inode, stream_idx - 1, w->lookup_table); + inode_remove_ads(dentry->d_inode, stream_idx - 1, + ctx->wim->lookup_table); return 0; } #ifdef HAVE_UTIMENSAT -/* - * Change the timestamp on a file dentry. +/* + * Change the timestamp on a file dentry. * * Note that alternate data streams do not have their own timestamps. */ @@ -1598,10 +1670,12 @@ static int wimfs_utimens(const char *path, const struct timespec tv[2]) { struct dentry *dentry; struct inode *inode; + WIMStruct *w = wimfs_get_WIMStruct(); + dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - inode = dentry->inode; + inode = dentry->d_inode; if (tv[0].tv_nsec != UTIME_OMIT) { if (tv[0].tv_nsec == UTIME_NOW) @@ -1625,7 +1699,7 @@ static int wimfs_utime(const char *path, struct utimbuf *times) dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - inode = dentry->inode; + inode = dentry->d_inode; inode->last_write_time = unix_timestamp_to_wim(times->modtime); inode->last_access_time = unix_timestamp_to_wim(times->actime); @@ -1633,10 +1707,10 @@ static int wimfs_utime(const char *path, struct utimbuf *times) } #endif -/* Writes to a file in the WIM filesystem. +/* 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, +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; @@ -1646,10 +1720,10 @@ static int wimfs_write(const char *path, const char *buf, size_t size, if (!fd) return -EBADF; - wimlib_assert(fd->lte); - wimlib_assert(fd->lte->staging_file_name); + wimlib_assert(fd->f_lte); + wimlib_assert(fd->f_lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); - wimlib_assert(fd->inode); + wimlib_assert(fd->f_inode); /* Seek to the requested position */ if (lseek(fd->staging_fd, offset, SEEK_SET) == -1) @@ -1661,8 +1735,8 @@ static int wimfs_write(const char *path, const char *buf, size_t size, return -errno; now = get_wim_timestamp(); - fd->inode->last_write_time = now; - fd->inode->last_access_time = now; + fd->f_inode->last_write_time = now; + fd->f_inode->last_access_time = now; return ret; } @@ -1671,8 +1745,8 @@ static struct fuse_operations wimfs_operations = { .destroy = wimfs_destroy, #if 0 .fallocate = wimfs_fallocate, - .fgetattr = wimfs_fgetattr, #endif + .fgetattr = wimfs_fgetattr, .ftruncate = wimfs_ftruncate, .getattr = wimfs_getattr, #ifdef ENABLE_XATTR @@ -1711,59 +1785,21 @@ static struct fuse_operations wimfs_operations = { }; -static int check_lte_refcnt(struct lookup_table_entry *lte, void *ignore) -{ - size_t lte_group_size = 0; - struct list_head *cur; - list_for_each(cur, <e->lte_group_list) - lte_group_size++; - if (lte_group_size > lte->refcnt) { -#ifdef ENABLE_ERROR_MESSAGES - struct dentry *example_dentry; - struct list_head *next; - struct stream_list_head *head; - WARNING("The following lookup table entry has a reference count " - "of %u, but", lte->refcnt); - WARNING("We found %zu references to it", lte_group_size); - next = lte->lte_group_list.next; - head = container_of(next, struct stream_list_head, list); - if (head->type == STREAM_TYPE_NORMAL) { - example_dentry = container_of(head, struct dentry, - lte_group_list); - WARNING("(One dentry referencing it is at `%s')", - example_dentry->full_path_utf8); - } - print_lookup_table_entry(lte); -#endif - /* Guess what! install.wim for Windows 8 contains a stream with - * 2 dentries referencing it, but the lookup table entry has - * reference count of 1. So we will need to handle this case - * and not just make it be an error... I'm just setting the - * reference count to the number of references we found. */ - - #if 1 - lte->refcnt = lte_group_size; - WARNING("Fixing reference count"); - #else - return WIMLIB_ERR_INVALID_DENTRY; - #endif - } - return 0; -} - /* Mounts a WIM file. */ -WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, +WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, int flags, WIMStruct **additional_swms, unsigned num_additional_swms) { int argc = 0; char *argv[16]; int ret; - char *p; + char *dir_copy; struct lookup_table *joined_tab, *wim_tab_save; + struct image_metadata *imd; + struct wimfs_context ctx; DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ", - wim, image, dir, flags); + wim, image, dir, flags); if (!wim || !dir) return WIMLIB_ERR_INVALID_PARAM; @@ -1782,92 +1818,76 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, wim->lookup_table = joined_tab; } - ret = wimlib_select_image(wim, image); + ret = select_wim_image(wim, image); if (ret != 0) goto out; - DEBUG("Selected image %d", image); + imd = &wim->image_metadata[image - 1]; - next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt); - - DEBUG("Resolving lookup table entries"); - /* Resolve all the lookup table entries of the dentry tree */ - for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes, - wim->lookup_table); - - DEBUG("Checking lookup table entry reference counts"); + DEBUG("Selected image %d", image); - ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL); - if (ret != 0) + if (imd->root_dentry->refcnt != 1) { + ERROR("Cannot mount image that was just exported with " + "wimlib_export()"); + ret = WIMLIB_ERR_INVALID_PARAM; goto out; - - if (flags & WIMLIB_MOUNT_FLAG_READWRITE) - wim_get_current_image_metadata(wim)->modified = true; + } if (!(flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE | WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR | WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS))) flags |= WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR; - DEBUG("Getting current directory"); - mount_dir = dir; - working_directory = getcwd(NULL, 0); - if (!working_directory) { + DEBUG("Initializing struct wimfs_context"); + init_wimfs_context(&ctx); + + DEBUG("Getting current directory"); + ctx.working_directory = getcwd(NULL, 0); + if (!ctx.working_directory) { ERROR_WITH_ERRNO("Could not determine current directory"); ret = WIMLIB_ERR_NOTDIR; goto out; } - DEBUG("Closing POSIX message queues"); - /* XXX hack to get rid of the message queues if they already exist for - * some reason (maybe left over from a previous mount that wasn't - * unmounted correctly) */ - ret = open_message_queues(true); + DEBUG("Unlinking message queues in case they already exist"); + ret = set_message_queue_names(&ctx, dir); if (ret != 0) - goto out; - close_message_queues(); + goto out_free_working_directory; + unlink_message_queues(&ctx); DEBUG("Preparing arguments to fuse_main()"); - - p = STRDUP(dir); - if (!p) { - ret = WIMLIB_ERR_NOMEM; - goto out; - } + dir_copy = STRDUP(dir); + if (!dir_copy) + goto out_free_message_queue_names; argv[argc++] = "imagex"; - argv[argc++] = p; + argv[argc++] = dir_copy; argv[argc++] = "-s"; /* disable multi-threaded operation */ if (flags & WIMLIB_MOUNT_FLAG_DEBUG) argv[argc++] = "-d"; - /* + /* * We provide the use_ino option because we are going to assign inode - * numbers oursides. We've already numbered the hard link groups with - * unique numbers with the assign_link_groups() function, and the static - * variable next_link_group_id is set to the next available link group - * ID that we will assign to new dentries. + * 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. */ - char optstring[256] = "use_ino"; + char optstring[256] = "use_ino,subtype=wimfs,attr_timeout=0"; argv[argc++] = "-o"; argv[argc++] = optstring; if ((flags & WIMLIB_MOUNT_FLAG_READWRITE)) { /* Read-write mount. Make the staging directory */ - make_staging_dir(); - if (!staging_dir_name) { - FREE(p); - ret = WIMLIB_ERR_MKDIR; - goto out; - } + ret = make_staging_dir(&ctx); + if (ret != 0) + goto out_free_dir_copy; } else { /* Read-only mount */ strcat(optstring, ",ro"); } - strcat(optstring, ",subtype=wimfs,attr_timeout=0"); argv[argc] = NULL; #ifdef ENABLE_DEBUG @@ -1883,13 +1903,32 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, } #endif - /* Set static variables. */ - w = wim; - mount_flags = flags; + /* Mark dentry tree as modified if read-write mount. */ + if (flags & WIMLIB_MOUNT_FLAG_READWRITE) + imd->modified = true; + + /* Resolve all the lookup table entries of the dentry tree */ + DEBUG("Resolving lookup table entries"); + for_dentry_in_tree(imd->root_dentry, dentry_resolve_ltes, + wim->lookup_table); + + ctx.next_ino = assign_inode_numbers(&imd->inode_list); + DEBUG("(next_ino = %"PRIu64")", ctx.next_ino); - ret = fuse_main(argc, argv, &wimfs_operations, NULL); + /* Finish initializing the filesystem context. */ + ctx.wim = wim; + ctx.mount_flags = flags; + + ret = fuse_main(argc, argv, &wimfs_operations, &ctx); if (ret) ret = WIMLIB_ERR_FUSE; +out_free_dir_copy: + FREE(dir_copy); +out_free_message_queue_names: + free_message_queue_names(&ctx); +out_free_working_directory: + FREE(ctx.working_directory); + ctx.working_directory = NULL; out: if (num_additional_swms) { free_lookup_table(wim->lookup_table); @@ -1899,7 +1938,7 @@ out: } -/* +/* * Unmounts the WIM file that was previously mounted on @dir by using * wimlib_mount(). */ @@ -1911,31 +1950,36 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) char msg[2]; struct timeval now; struct timespec timeout; - int msgsize; - int errno_save; + long msgsize; + struct wimfs_context ctx; + char *mailbox; - mount_dir = dir; + init_wimfs_context(&ctx); /* Open message queues between the unmount process and the * filesystem daemon. */ - ret = open_message_queues(false); + ret = set_message_queue_names(&ctx, dir); if (ret != 0) - return ret; + goto out; + + ret = open_message_queues(&ctx, false); + if (ret != 0) + goto out_free_message_queue_names; - /* Send a message to the filesystem saying whether to commit or + /* Send a message to the filesystem daemon saying whether to commit or * not. */ msg[0] = (flags & WIMLIB_UNMOUNT_FLAG_COMMIT) ? 1 : 0; msg[1] = (flags & WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY) ? 1 : 0; - DEBUG("Sending message: %s, %s", - (msg[0] == 0) ? "don't commit" : "commit", - (msg[1] == 0) ? "don't check" : "check"); - ret = mq_send(unmount_to_daemon_mq, msg, 2, 1); + DEBUG("Sending message: %scommit, %scheck", + (msg[0] ? "" : "don't "), + (msg[1] ? "" : "don't ")); + ret = mq_send(ctx.unmount_to_daemon_mq, msg, 2, 1); if (ret == -1) { - ERROR("Failed to notify filesystem daemon whether we want to " - "commit changes or not"); - close_message_queues(); - return WIMLIB_ERR_MQUEUE; + ERROR_WITH_ERRNO("Failed to notify filesystem daemon whether " + "we want to commit changes or not"); + ret = WIMLIB_ERR_MQUEUE; + goto out_close_message_queues; } /* Execute `fusermount -u', which is installed setuid root, to unmount @@ -1947,26 +1991,29 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) * send a message from this process to the filesystem daemon telling * whether --commit was specified or not. However, after that, the * unmount process must wait for the filesystem daemon to finish writing - * the WIM file. + * the WIM file. */ - pid = fork(); if (pid == -1) { ERROR_WITH_ERRNO("Failed to fork()"); - return WIMLIB_ERR_FORK; + ret = WIMLIB_ERR_FORK; + goto out_close_message_queues; } if (pid == 0) { + /* Child */ execlp("fusermount", "fusermount", "-u", dir, NULL); ERROR_WITH_ERRNO("Failed to execute `fusermount'"); exit(WIMLIB_ERR_FUSERMOUNT); } + /* Parent */ ret = wait(&status); if (ret == -1) { ERROR_WITH_ERRNO("Failed to wait for fusermount process to " "terminate"); - return WIMLIB_ERR_FUSERMOUNT; + ret = WIMLIB_ERR_FUSERMOUNT; + goto out_close_message_queues; } if (status != 0) { @@ -1979,26 +2026,32 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) pid = fork(); if (pid == -1) { ERROR_WITH_ERRNO("Failed to fork()"); - return WIMLIB_ERR_FORK; + ret = WIMLIB_ERR_FORK; + goto out_close_message_queues; } if (pid == 0) { + /* Child */ execlp("umount", "umount", dir, NULL); ERROR_WITH_ERRNO("Failed to execute `umount'"); exit(WIMLIB_ERR_FUSERMOUNT); } + /* Parent */ ret = wait(&status); if (ret == -1) { ERROR_WITH_ERRNO("Failed to wait for `umount' process to " "terminate"); - return WIMLIB_ERR_FUSERMOUNT; + ret = WIMLIB_ERR_FUSERMOUNT; + goto out_close_message_queues; } if (status != 0) { ERROR("`umount' exited with failure status"); - return WIMLIB_ERR_FUSERMOUNT; + ret = WIMLIB_ERR_FUSERMOUNT; + goto out_close_message_queues; } } + wimlib_assert(status == 0); /* Wait for a message from the filesytem daemon indicating whether the * filesystem was unmounted successfully (0) or an error occurred (1). @@ -2009,42 +2062,51 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) * filesystem daemon has crashed or failed for some reason. * * XXX come up with some method to determine if the filesystem - * daemon has really crashed or not. + * daemon has really crashed or not. * * XXX Idea: have mount daemon write its PID into the WIM file header? + * No, this wouldn't work because we know the directory but not the WIM + * file... * */ gettimeofday(&now, NULL); timeout.tv_sec = now.tv_sec + 600; timeout.tv_nsec = now.tv_usec * 1000; - msgsize = mq_get_msgsize(daemon_to_unmount_mq); - char mailbox[msgsize]; + ret = get_mailbox(ctx.daemon_to_unmount_mq, 2, &msgsize, &mailbox); + if (ret != 0) + goto out_close_message_queues; mailbox[0] = 0; DEBUG("Waiting for message telling us whether the unmount was " "successful or not."); - ret = mq_timedreceive(daemon_to_unmount_mq, mailbox, msgsize, - NULL, &timeout); - errno_save = errno; - close_message_queues(); + ret = mq_timedreceive(ctx.daemon_to_unmount_mq, mailbox, + msgsize, NULL, &timeout); if (ret == -1) { - if (errno_save == ETIMEDOUT) { + if (errno == ETIMEDOUT) { ERROR("Timed out- probably the filesystem daemon " "crashed and the WIM was not written " "successfully."); - return WIMLIB_ERR_TIMEOUT; + ret = WIMLIB_ERR_TIMEOUT; } else { - ERROR("mq_receive(): %s", strerror(errno_save)); - return WIMLIB_ERR_MQUEUE; + ERROR_WITH_ERRNO("mq_receive()"); + ret = WIMLIB_ERR_MQUEUE; } + goto out_free_mailbox; } - DEBUG("Received message: %s", - (mailbox[0] == 0) ? "Unmount OK" : "Unmount Failed"); - if (mailbox[0] != 0) + DEBUG("Received message: Unmount %s", (mailbox[0] ? "Failed" : "Ok")); + ret = mailbox[0]; + if (ret) ERROR("Unmount failed"); - return mailbox[0]; +out_free_mailbox: + FREE(mailbox); +out_close_message_queues: + close_message_queues(&ctx); +out_free_message_queue_names: + free_message_queue_names(&ctx); +out: + return ret; } #else /* WITH_FUSE */ @@ -2052,7 +2114,7 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) static inline int mount_unsupported_error() { - ERROR("WIMLIB was compiled with --without-fuse, which disables support " + ERROR("wimlib was compiled with --without-fuse, which disables support " "for mounting WIMs."); return WIMLIB_ERR_UNSUPPORTED; } @@ -2062,7 +2124,7 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) return mount_unsupported_error(); } -WIMLIBAPI int wimlib_mount(WIMStruct *wim_p, int image, const char *dir, +WIMLIBAPI int wimlib_mount(WIMStruct *wim_p, int image, const char *dir, int flags, WIMStruct **additional_swms, unsigned num_additional_swms) {