X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmount.c;h=b1d7381072f224de30778839dba6847890f3b1bb;hb=234772d171811db50c2945c091d5a5aa9040cfac;hp=5b1e09e35bed4a62f9be61d26846ace89982ec52;hpb=54193a504d8dcf1e2dfae727c76cd1b44884518b;p=wimlib diff --git a/src/mount.c b/src/mount.c index 5b1e09e3..b1d73810 100644 --- a/src/mount.c +++ b/src/mount.c @@ -29,6 +29,7 @@ #include "wimlib_internal.h" #ifdef WITH_FUSE + #include "sha1.h" #include "lookup_table.h" #include "xml.h" @@ -44,17 +45,19 @@ #include #include #include +#include #ifdef ENABLE_XATTR #include #endif +/* File descriptor to a file open on the WIM filesystem. */ struct wimlib_fd { - u16 idx; - int staging_fd; - u64 hard_link_group; + struct inode *inode; struct lookup_table_entry *lte; - struct dentry *dentry; + int staging_fd; + u16 idx; + u32 stream_id; }; /* The WIMStruct for the mounted WIM. */ @@ -77,9 +80,8 @@ static int mount_flags; /* Name of the directory on which the WIM file is mounted. */ static const char *mount_dir; -/* Next hard link group ID to be assigned. These are also used as the inode - * numbers. */ -static u64 next_link_group_id; +/* Next inode number to be assigned. */ +static u64 next_ino; /* List of lookup table entries in the staging directory */ static LIST_HEAD(staging_list); @@ -98,53 +100,79 @@ static inline int flags_writable(int open_flags) return open_flags & (O_RDWR | O_WRONLY); } -/* - * Allocate a file descriptor for a lookup table entry - */ -static int alloc_wimlib_fd(struct lookup_table_entry *lte, +static int alloc_wimlib_fd(struct inode *inode, + u32 stream_id, + struct lookup_table_entry *lte, struct wimlib_fd **fd_ret) { static const u16 fds_per_alloc = 8; static const u16 max_fds = 0xffff; - if (lte->num_opened_fds == lte->num_allocated_fds) { + 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 (lte->num_allocated_fds == max_fds) + if (inode->num_allocated_fds == max_fds) return -EMFILE; - num_new_fds = min(fds_per_alloc, max_fds - lte->num_allocated_fds); + num_new_fds = min(fds_per_alloc, max_fds - inode->num_allocated_fds); - fds = REALLOC(lte->fds, (lte->num_allocated_fds + num_new_fds) * - sizeof(lte->fds[0])); + fds = REALLOC(inode->fds, (inode->num_allocated_fds + num_new_fds) * + sizeof(inode->fds[0])); if (!fds) return -ENOMEM; - memset(&fds[lte->num_allocated_fds], 0, + memset(&fds[inode->num_allocated_fds], 0, num_new_fds * sizeof(fds[0])); - lte->fds = fds; - lte->num_allocated_fds += num_new_fds; + inode->fds = fds; + inode->num_allocated_fds += num_new_fds; } for (u16 i = 0; ; i++) { - if (!lte->fds[i]) { + if (!inode->fds[i]) { struct wimlib_fd *fd = CALLOC(1, sizeof(*fd)); if (!fd) return -ENOMEM; + fd->inode = inode; + fd->lte = lte; fd->staging_fd = -1; fd->idx = i; - fd->lte = lte; - lte->fds[i] = fd; - lte->num_opened_fds++; + fd->stream_id = stream_id; *fd_ret = fd; + inode->fds[i] = fd; + inode->num_opened_fds++; + if (lte) + lte->num_opened_fds++; + DEBUG("Allocated fd"); return 0; } } } -static int close_wimlib_fd(struct wimlib_fd *fd) +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(inode->num_opened_fds); + wimlib_assert(fd->idx < inode->num_opened_fds); + wimlib_assert(inode->fds[fd->idx] == fd); + + inode->fds[fd->idx] = NULL; + FREE(fd); + if (--inode->num_opened_fds == 0 && inode->link_count == 0) + free_inode(inode); +} + +static int lte_put_fd(struct lookup_table_entry *lte, struct wimlib_fd *fd) { - struct lookup_table_entry *lte = fd->lte; + wimlib_assert(fd); + wimlib_assert(fd->lte == lte); + + if (!lte) /* Empty stream with no lookup table entry */ + return 0; - wimlib_assert(lte); wimlib_assert(lte->num_opened_fds); if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { @@ -153,78 +181,95 @@ static int close_wimlib_fd(struct wimlib_fd *fd) if (close(fd->staging_fd) != 0) return -errno; } - if (--lte->num_opened_fds == 0 && lte->refcnt == 0) { - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { - wimlib_assert(lte->staging_file_name); - unlink(lte->staging_file_name); - } - free_lookup_table_entry(lte); - } - wimlib_assert(lte->fds[fd->idx] == fd); - lte->fds[fd->idx] = NULL; - FREE(fd); + lte_decrement_num_opened_fds(lte, w->lookup_table); return 0; } -/* Remove a dentry and all its alternate file streams */ +static int close_wimlib_fd(struct wimlib_fd *fd) +{ + int ret; + DEBUG("Closing fd (inode = %lu, opened = %u, allocated = %u)", + fd->inode->ino, fd->inode->num_opened_fds, + fd->inode->num_allocated_fds); + ret = lte_put_fd(fd->lte, fd); + if (ret != 0) + return ret; + + inode_put_fd(fd->inode, fd); + return 0; +} + +/* Remove a dentry; i.e. remove a reference to the inode. + * + * If there are no remaining references to the inode either through detnries or + * open file descriptors, the inode is 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. */ static void remove_dentry(struct dentry *dentry, struct lookup_table *lookup_table) { - wimlib_assert(dentry); - wimlib_assert(dentry->resolved); - - struct lookup_table_entry *lte = dentry->lte; - u16 i = 0; - while (1) { - lte = lte_decrement_refcnt(lte, lookup_table); - if (lte && lte->num_opened_fds) - for (u16 i = 0; i < lte->num_allocated_fds; i++) - if (lte->fds[i] && lte->fds[i]->dentry == dentry) - lte->fds[i]->dentry = NULL; - if (i == dentry->num_ads) - break; - lte = dentry->ads_entries[i].lte; - i++; - } + struct inode *inode = dentry->inode; + struct lookup_table_entry *lte; + unsigned i; + for (i = 0; i <= inode->num_ads; i++) { + lte = inode_stream_lte_resolved(inode, i); + if (lte) + lte_decrement_refcnt(lte, lookup_table); + } unlink_dentry(dentry); put_dentry(dentry); } -static void remove_ads(struct dentry *dentry, - struct ads_entry *ads_entry, - struct lookup_table *lookup_table) +/* 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; - wimlib_assert(dentry->resolved); + ads_entry = inode->ads_entries[idx]; + + wimlib_assert(ads_entry); + + lte = ads_entry->lte; - lte = lte_decrement_refcnt(ads_entry->lte, lookup_table); if (lte) - list_del(&ads_entry->lte_group_list.list); - dentry_remove_ads(dentry, ads_entry); + 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 dentry to a `stat' buffer. */ -int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) +/* 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) { - struct lookup_table_entry *lte; - - if (dentry_is_symlink(dentry)) + if (inode_is_symlink(inode)) stbuf->st_mode = S_IFLNK | 0777; - else if (dentry_is_directory(dentry)) + else if (inode_is_directory(inode)) stbuf->st_mode = S_IFDIR | 0755; else stbuf->st_mode = S_IFREG | 0644; - stbuf->st_ino = (ino_t)dentry->link_group_id; - - stbuf->st_nlink = dentry_link_group_size(dentry); + stbuf->st_ino = (ino_t)inode->ino; + stbuf->st_nlink = inode->link_count; stbuf->st_uid = getuid(); stbuf->st_gid = getgid(); - /* Use the size of the unnamed (default) file stream. */ - lte = dentry_unnamed_lte_resolved(dentry); if (lte) { if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { wimlib_assert(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE); @@ -243,9 +288,9 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) stbuf->st_size = 0; } - stbuf->st_atime = wim_timestamp_to_unix(dentry->last_access_time); - stbuf->st_mtime = wim_timestamp_to_unix(dentry->last_write_time); - stbuf->st_ctime = wim_timestamp_to_unix(dentry->creation_time); + 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; } @@ -305,106 +350,13 @@ static int create_staging_file(char **name_ret, int open_flags) return fd; } -/* - * Removes open file descriptors from a lookup table entry @old_lte where the - * file descriptors have opened the corresponding file resource in the context - * of the hard link group @link_group; these file descriptors are extracted and - * placed in a new lookup table entry, which is returned. - */ -static struct lookup_table_entry * -lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group) -{ - u16 num_transferred_fds; - struct lookup_table_entry *new_lte; - - new_lte = new_lookup_table_entry(); - if (!new_lte) - return NULL; - - num_transferred_fds = 0; - for (u16 i = 0; i < old_lte->num_allocated_fds; i++) - if (old_lte->fds[i] && old_lte->fds[i]->dentry && - old_lte->fds[i]->dentry->link_group_id == link_group) - num_transferred_fds++; - DEBUG("Transferring %u file descriptors", - num_transferred_fds); - new_lte->fds = MALLOC(num_transferred_fds * sizeof(new_lte->fds[0])); - if (!new_lte->fds) { - FREE(new_lte); - return NULL; - } - for (u16 i = 0, j = 0; ; i++) { - if (old_lte->fds[i] && old_lte->fds[i]->dentry && - old_lte->fds[i]->dentry->link_group_id == link_group) { - struct wimlib_fd *fd = old_lte->fds[i]; - old_lte->fds[i] = NULL; - fd->lte = new_lte; - fd->idx = j; - new_lte->fds[j] = fd; - if (++j == num_transferred_fds) - break; - } - } - DEBUG("old_lte: %u fds open; new_lte: %u fds open", - old_lte->num_opened_fds, new_lte->num_opened_fds); - old_lte->num_opened_fds -= num_transferred_fds; - new_lte->num_opened_fds = num_transferred_fds; - new_lte->num_allocated_fds = num_transferred_fds; - return new_lte; -} - -/* - * Transfers an alternate data stream entry to a new lookup table entry - */ -static void lte_transfer_ads_entry(struct lookup_table_entry *new_lte, - struct ads_entry *ads_entry) -{ - list_del(&ads_entry->lte_group_list.list); - list_add(&ads_entry->lte_group_list.list, &new_lte->lte_group_list); - ads_entry->lte = new_lte; -} - -/* - * Transfers a dentry to a new lookup table entry - */ -static void lte_transfer_dentry(struct lookup_table_entry *new_lte, - struct dentry *dentry) -{ - wimlib_assert(dentry->lte_group_list.list.next); - wimlib_assert(new_lte->lte_group_list.next); - list_del(&dentry->lte_group_list.list); - list_add(&dentry->lte_group_list.list, &new_lte->lte_group_list); - dentry->lte = new_lte; -} - -static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte, - struct dentry *dentry, - unsigned stream_idx) -{ - INIT_LIST_HEAD(&new_lte->lte_group_list); - if (stream_idx == 0) { - struct list_head *pos = &dentry->link_group_list; - do { - struct dentry *d; - d = container_of(pos, struct dentry, link_group_list); - wimlib_assert(d->link_group_id == dentry->link_group_id); - lte_transfer_dentry(new_lte, d); - pos = pos->next; - } while (pos != &dentry->link_group_list); - } else { - struct ads_entry *ads_entry; - wimlib_assert(stream_idx <= dentry->num_ads); - ads_entry = &dentry->ads_entries[stream_idx - 1]; - lte_transfer_ads_entry(new_lte, ads_entry); - } -} - /* * Extract a WIM resource to the staging directory. * - * @dentry, @stream_idx: The stream on whose behalf we are modifying the lookup - * table entry (these may be more streams than this that reference the lookup - * table entry) + * @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 @@ -412,8 +364,8 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte, * @size: Number of bytes of the stream we want to extract (this supports the * wimfs_truncate() function). */ -static int extract_resource_to_staging_dir(struct dentry *dentry, - unsigned stream_idx, +static int extract_resource_to_staging_dir(struct inode *inode, + u32 stream_id, struct lookup_table_entry **lte, off_t size) { @@ -421,24 +373,6 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, int ret; int fd; struct lookup_table_entry *old_lte, *new_lte; - size_t link_group_size; - - /* - * We need to: - * - Create a staging file for the WIM resource - * - Extract the resource to it - * - Create a new lte for the file resource - * - Transfer fds from the old lte to the new lte, but only if they share the - * same hard link group as this dentry. If there is no old lte, then this - * step does not need to be done - * - Transfer stream entries from the old lte's list to the new lte's list. If - * there is no old lte, we instead transfer entries for the hard link group. - * - * Note: *lte is permitted to be NULL, in which case there is no old - * lookup table entry. - */ - - DEBUG("Extracting resource `%s' to staging directory", dentry->full_path_utf8); old_lte = *lte; fd = create_staging_file(&staging_file_name, O_WRONLY); @@ -458,65 +392,102 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, goto out_delete_staging_file; } - link_group_size = dentry_link_group_size(dentry); - - if (old_lte) { - if (link_group_size == old_lte->refcnt) { - /* This hard link group is the only user of the lookup - * table entry, so we can re-use it. */ - 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(w->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 " - "(link_group_size = %zu, lte refcnt = %u)", - link_group_size, old_lte->refcnt); - /* Split a hard link group away from the "lookup table - * entry" hard link group (i.e. we had two hard link - * groups that were identical, but now we are changing - * one of them) */ - - /* XXX - * The ADS really complicate things here and not - * everything is going to work correctly yet. For - * example it could be the same that a file contains two - * file streams that are identical and therefore share - * the same lookup table entry despite the fact that the - * streams themselves are not hardlinked. - * XXX*/ - wimlib_assert(old_lte->refcnt > link_group_size); - - new_lte = lte_extract_fds(old_lte, dentry->link_group_id); - if (!new_lte) { - ret = -ENOMEM; - goto out_delete_staging_file; - } + "(inode->link_count = %zu, old_lte->refcnt = %u)", + inode->link_count, old_lte->refcnt); + + } - lte_transfer_stream_entries(new_lte, dentry, stream_idx); - old_lte->refcnt -= link_group_size; - } - } else { - /* No old_lte was supplied, so the resource had no lookup table - * entry before (it must be an empty resource) */ new_lte = new_lookup_table_entry(); if (!new_lte) { ret = -ENOMEM; goto out_delete_staging_file; } - lte_transfer_stream_entries(new_lte, dentry, stream_idx); + + /* 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->lte == old_lte); + fd->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++; + } + } + DEBUG("%zu 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 = link_group_size; + new_lte->refcnt = inode->link_count; random_hash(new_lte->hash); - if (new_lte->staging_file_name) - FREE(new_lte->staging_file_name); new_lte->staging_file_name = staging_file_name; new_lte->resource_location = RESOURCE_IN_STAGING_FILE; + 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(w->lookup_table, new_lte); list_add(&new_lte->staging_list, &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->lte == new_lte) { + fd->lte = old_lte; + if (fd->staging_fd != -1) { + close(fd->staging_fd); + fd->staging_fd = -1; + } + j++; + } + } +out_free_new_lte: + free_lookup_table_entry(new_lte); out_delete_staging_file: unlink(staging_file_name); FREE(staging_file_name); @@ -563,7 +534,7 @@ static void make_staging_dir() } static int remove_file_or_directory(const char *fpath, const struct stat *sb, - int typeflag, struct FTW *ftwbuf) + int typeflag, struct FTW *ftwbuf) { if (remove(fpath) == 0) return 0; @@ -575,7 +546,7 @@ static int remove_file_or_directory(const char *fpath, const struct stat *sb, /* * Deletes the staging directory and all the files contained in it. */ -static inline int delete_staging_dir() +static int delete_staging_dir() { int ret; @@ -592,23 +563,21 @@ static inline int delete_staging_dir() * commands */ static char *unmount_to_daemon_mq_name; static char *daemon_to_unmount_mq_name; -static int unmount_to_daemon_mq; -static int daemon_to_unmount_mq; +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, - const char *s4) + const char *s4) { size_t len = strlen(s1) + strlen(s2) + strlen(s3) + strlen(s4) + 1; char *p = MALLOC(len); if (!p) return NULL; - *p = '\0'; - strcat(p, s1); - strcat(p, s2); - strcat(p, s3); - strcat(p, s4); - return p; + p = strcpy(p, s1); + p = strcat(p, s2); + p = strcat(p, s3); + return strcat(p, s4); } /* Removes trailing forward slashes in a string. */ @@ -681,7 +650,7 @@ static int open_message_queues(bool daemon) unmount_to_daemon_mq = mq_open(unmount_to_daemon_mq_name, flags, 0700, NULL); - if (unmount_to_daemon_mq == -1) { + if (unmount_to_daemon_mq == (mqd_t)-1) { ERROR_WITH_ERRNO("mq_open()"); ret = WIMLIB_ERR_MQUEUE; goto err2; @@ -695,7 +664,7 @@ static int open_message_queues(bool daemon) daemon_to_unmount_mq = mq_open(daemon_to_unmount_mq_name, flags, 0700, NULL); - if (daemon_to_unmount_mq == -1) { + if (daemon_to_unmount_mq == (mqd_t)-1) { ERROR_WITH_ERRNO("mq_open()"); ret = WIMLIB_ERR_MQUEUE; goto err3; @@ -755,6 +724,7 @@ static int wimfs_access(const char *path, int mask) 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) @@ -796,6 +766,7 @@ static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, } } } +#endif static int update_lte_of_staging_file(struct lookup_table_entry *lte, @@ -820,10 +791,14 @@ 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 free_lookup_table_entry(lte); } else { @@ -849,12 +824,14 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity) struct lookup_table_entry *lte, *tmp; /* 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); if (ret != 0) return ret; } +#endif /* Calculate SHA1 checksums for all staging files, and merge unnecessary * lookup table entries. */ @@ -987,14 +964,15 @@ static int wimfs_ftruncate(const char *path, off_t size, static int wimfs_getattr(const char *path, struct stat *stbuf) { struct dentry *dentry; + struct lookup_table_entry *lte; int ret; ret = lookup_resource(w, path, get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK, - &dentry, NULL, NULL); + &dentry, <e, NULL); if (ret != 0) return ret; - return dentry_to_stbuf(dentry, stbuf); + return inode_to_stbuf(dentry->inode, lte, stbuf); } #ifdef ENABLE_XATTR @@ -1018,7 +996,7 @@ static int wimfs_getxattr(const char *path, const char *name, char *value, dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - ads_entry = dentry_get_ads_entry(dentry, name); + ads_entry = inode_get_ads_entry(dentry->inode, name, NULL); if (!ads_entry) return -ENOATTR; @@ -1041,11 +1019,17 @@ static int wimfs_link(const char *to, const char *from) { struct dentry *to_dentry, *from_dentry, *from_dentry_parent; const char *link_name; + struct inode *inode; + unsigned i; + struct lookup_table_entry *lte; to_dentry = get_dentry(w, to); if (!to_dentry) return -ENOENT; - if (!dentry_is_regular_file(to_dentry)) + + inode = to_dentry->inode; + + if (!inode_is_regular_file(inode)) return -EPERM; from_dentry_parent = get_parent_dentry(w, from); @@ -1057,32 +1041,20 @@ static int wimfs_link(const char *to, const char *from) link_name = path_basename(from); if (get_dentry_child_with_name(from_dentry_parent, link_name)) return -EEXIST; - from_dentry = clone_dentry(to_dentry); + from_dentry = new_dentry(link_name); if (!from_dentry) return -ENOMEM; - if (change_dentry_name(from_dentry, link_name) != 0) { - FREE(from_dentry); - return -ENOMEM; - } - /* Add the new dentry to the dentry list for the link group */ - list_add(&from_dentry->link_group_list, &to_dentry->link_group_list); - /* Increment reference counts for the unnamed file stream and all - * alternate data streams. */ - if (from_dentry->lte) { - list_add(&from_dentry->lte_group_list.list, - &to_dentry->lte_group_list.list); - from_dentry->lte->refcnt++; - } - for (u16 i = 0; i < from_dentry->num_ads; i++) { - struct ads_entry *ads_entry = &from_dentry->ads_entries[i]; - if (ads_entry->lte) - ads_entry->lte->refcnt++; - } + inode_add_dentry(from_dentry, inode); + from_dentry->inode = inode; + inode->link_count++; - /* The ADS entries are owned by another dentry. */ - from_dentry->ads_entries_status = ADS_ENTRIES_USER; + for (i = 0; i <= inode->num_ads; i++) { + lte = inode_stream_lte_resolved(inode, i); + if (lte) + lte->refcnt++; + } link_dentry(from_dentry, from_dentry_parent); return 0; @@ -1096,6 +1068,7 @@ static int wimfs_listxattr(const char *path, char *list, size_t size) char *p = list; size_t needed_size; unsigned i; + struct inode *inode; if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; @@ -1104,18 +1077,20 @@ static int wimfs_listxattr(const char *path, char *list, size_t size) ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL); if (ret != 0) return ret; + inode = dentry->inode; + if (size == 0) { needed_size = 0; - for (i = 0; i < dentry->num_ads; i++) - needed_size += dentry->ads_entries[i].stream_name_utf8_len + 6; + for (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 < dentry->num_ads; i++) { - needed_size = dentry->ads_entries[i].stream_name_utf8_len + 6; + for (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", - dentry->ads_entries[i].stream_name_utf8) + 1; + inode->ads_entries[i]->stream_name_utf8) + 1; size -= needed_size; } return p - list; @@ -1144,10 +1119,10 @@ static int wimfs_mkdir(const char *path, mode_t mode) if (get_dentry_child_with_name(parent, basename)) return -EEXIST; - newdir = new_dentry(basename); - newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY; - newdir->resolved = true; - newdir->link_group_id = next_link_group_id++; + newdir = new_dentry_with_inode(basename); + newdir->inode->attributes |= FILE_ATTRIBUTE_DIRECTORY; + newdir->inode->resolved = true; + newdir->inode->ino = next_ino++; link_dentry(newdir, parent); return 0; } @@ -1170,9 +1145,9 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) dentry = get_dentry(w, path); if (!dentry || !dentry_is_regular_file(dentry)) return -ENOENT; - if (dentry_get_ads_entry(dentry, stream_name)) + if (inode_get_ads_entry(dentry->inode, stream_name, NULL)) return -EEXIST; - new_entry = dentry_add_ads(dentry, stream_name); + new_entry = inode_add_ads(dentry->inode, stream_name); if (!new_entry) return -ENOENT; } else { @@ -1193,13 +1168,11 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) if (get_dentry_child_with_name(parent, path)) return -EEXIST; - dentry = new_dentry(basename); + dentry = new_dentry_with_inode(basename); if (!dentry) return -ENOMEM; - dentry->resolved = true; - dentry->link_group_id = next_link_group_id++; - dentry->lte_group_list.type = STREAM_TYPE_NORMAL; - INIT_LIST_HEAD(&dentry->lte_group_list.list); + dentry->inode->resolved = true; + dentry->inode->ino = next_ino++; link_dentry(dentry, parent); } return 0; @@ -1213,51 +1186,42 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) struct lookup_table_entry *lte; int ret; struct wimlib_fd *fd; - unsigned stream_idx; + struct inode *inode; + u16 stream_idx; + u32 stream_id; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e, &stream_idx); if (ret != 0) return ret; - if (!lte) { - /* Empty file with no lookup-table entry. This is fine if it's - * a read-only filesystem. Otherwise we need to create a lookup - * table entry so that we can keep track of the file descriptors - * (this is important in case someone opens the file for - * writing) */ - if (!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) { - fi->fh = 0; - return 0; - } + inode = dentry->inode; - ret = extract_resource_to_staging_dir(dentry, stream_idx, - <e, 0); + if (stream_idx == 0) + stream_id = 0; + else + 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 + * open a native file descriptor for the corresponding file. Otherwise, + * 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 || 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, size); if (ret != 0) return ret; } - ret = alloc_wimlib_fd(lte, &fd); + ret = alloc_wimlib_fd(inode, stream_id, lte, &fd); if (ret != 0) return ret; - fd->dentry = dentry; - - /* 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 open a native file descriptor for the - * corresponding file. Otherwise, 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) { - ret = extract_resource_to_staging_dir(dentry, stream_idx, <e, - lte->resource_entry.original_size); - 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); @@ -1271,16 +1235,18 @@ 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) + inode = wim_pathname_to_inode(w, path); + if (!inode) return -ENOENT; - if (!dentry_is_directory(dentry)) + if (!inode_is_directory(inode)) return -ENOTDIR; - dentry->num_times_opened++; - fi->fh = (uintptr_t)dentry; - return 0; + ret = alloc_wimlib_fd(inode, 0, NULL, &fd); + fi->fh = (uintptr_t)fd; + return ret; } @@ -1292,14 +1258,11 @@ static int wimfs_read(const char *path, char *buf, size_t size, { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; - if (!fd) { - /* Empty file with no lookup table entry on read-only mounted - * WIM */ - wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)); - return 0; - } + if (!fd) + return -EBADF; - wimlib_assert(fd->lte); + if (!fd->lte) /* Empty stream with no lookup table entry */ + return 0; if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) { /* Read from staging file */ @@ -1319,14 +1282,12 @@ static int wimfs_read(const char *path, char *buf, size_t size, } else { /* Read from WIM */ - const struct resource_entry *res_entry; + u64 res_size = wim_resource_size(fd->lte); - res_entry = &fd->lte->resource_entry; - - if (offset > res_entry->original_size) + if (offset > res_size) return -EOVERFLOW; - size = min(size, res_entry->original_size - offset); + size = min(size, res_size - offset); if (read_wim_resource(fd->lte, (u8*)buf, size, offset, false) != 0) @@ -1340,15 +1301,20 @@ static int wimfs_read(const char *path, char *buf, size_t size, static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi) { - struct dentry *parent, *child; - - parent = (struct dentry*)(uintptr_t)fi->fh; - wimlib_assert(parent); - child = parent->children; + struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; + struct inode *inode; + struct dentry *child; + + if (!fd) + return -EBADF; + + inode = fd->inode; filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); + child = inode->children; + if (!child) return 0; @@ -1356,7 +1322,7 @@ static int wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, if (filler(buf, child->file_name_utf8, NULL, 0)) return 0; child = child->next; - } while (child != parent->children); + } while (child != inode->children); return 0; } @@ -1370,61 +1336,25 @@ static int wimfs_readlink(const char *path, char *buf, size_t buf_len) if (!dentry_is_symlink(dentry)) return -EINVAL; - ret = dentry_readlink(dentry, buf, buf_len, w); + ret = inode_readlink(dentry->inode, buf, buf_len, w); if (ret > 0) ret = 0; return ret; } -/* Creation time, write time, access time */ -static void -dentry_link_group_set_times(struct dentry *dentry, u64 times[3]) -{ - struct dentry *cur = dentry; - do { - if (times[0]) - dentry->creation_time = times[0]; - if (times[1]) - dentry->last_write_time = times[1]; - if (times[2]) - dentry->last_access_time = times[2]; - } while ((cur = container_of(dentry->link_group_list.next, - struct dentry, - link_group_list)) != dentry); -} - -static void -dentry_link_group_update_times(struct dentry *dentry) -{ - u64 now = get_wim_timestamp(); - u64 times[3] = {now, now, now}; - dentry_link_group_set_times(dentry, times); -} - /* Close a file. */ static int wimfs_release(const char *path, struct fuse_file_info *fi) { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; - - if (!fd) { - /* Empty file with no lookup table entry on read-only mounted - * WIM */ - wimlib_assert(!(mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)); - return 0; - } - + wimlib_assert(fd); return close_wimlib_fd(fd); } static int wimfs_releasedir(const char *path, struct fuse_file_info *fi) { - struct dentry *dentry = (struct dentry *)(uintptr_t)fi->fh; - - wimlib_assert(dentry); - wimlib_assert(dentry->num_times_opened); - if (--dentry->num_times_opened == 0) - free_dentry(dentry); - return 0; + struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; + wimlib_assert(fd); + return close_wimlib_fd(fd); } #ifdef ENABLE_XATTR @@ -1433,6 +1363,7 @@ static int wimfs_removexattr(const char *path, const char *name) { struct dentry *dentry; struct ads_entry *ads_entry; + u16 ads_idx; if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; @@ -1444,10 +1375,10 @@ static int wimfs_removexattr(const char *path, const char *name) if (!dentry) return -ENOENT; - ads_entry = dentry_get_ads_entry(dentry, name); + ads_entry = inode_get_ads_entry(dentry->inode, name, &ads_idx); if (!ads_entry) return -ENOATTR; - remove_ads(dentry, ads_entry, w->lookup_table); + inode_remove_ads(dentry->inode, ads_idx, w->lookup_table); return 0; } #endif @@ -1493,7 +1424,7 @@ static int wimfs_rename(const char *from, const char *to) * directory */ if (!dentry_is_directory(dst)) return -ENOTDIR; - if (dst->children != NULL) + if (dst->inode->children != NULL) return -ENOTEMPTY; } parent_of_dst = dst->parent; @@ -1532,9 +1463,7 @@ static int wimfs_rmdir(const char *path) if (!dentry_is_empty_directory(dentry)) return -ENOTEMPTY; - unlink_dentry(dentry); - if (dentry->num_times_opened == 0) - free_dentry(dentry); + remove_dentry(dentry, w->lookup_table); return 0; } @@ -1543,12 +1472,13 @@ 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; struct lookup_table_entry *lte; + struct inode *inode; u8 value_hash[SHA1_HASH_SIZE]; + u16 ads_idx; if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR)) return -ENOTSUP; @@ -1557,19 +1487,20 @@ static int wimfs_setxattr(const char *path, const char *name, return -ENOATTR; name += 5; - dentry = get_dentry(w, path); - if (!dentry) + inode = wim_pathname_to_inode(w, path); + if (!inode) return -ENOENT; - existing_ads_entry = dentry_get_ads_entry(dentry, name); + + existing_ads_entry = inode_get_ads_entry(inode, name, &ads_idx); if (existing_ads_entry) { if (flags & XATTR_CREATE) return -EEXIST; - remove_ads(dentry, existing_ads_entry, w->lookup_table); + inode_remove_ads(inode, ads_idx, w->lookup_table); } else { if (flags & XATTR_REPLACE) return -ENOATTR; } - new_ads_entry = dentry_add_ads(dentry, name); + new_ads_entry = inode_add_ads(inode, name); if (!new_ads_entry) return -ENOMEM; @@ -1608,7 +1539,7 @@ static int wimfs_symlink(const char *to, const char *from) { struct dentry *dentry_parent, *dentry; const char *link_name; - struct lookup_table_entry *lte; + struct inode *inode; dentry_parent = get_parent_dentry(w, from); if (!dentry_parent) @@ -1620,24 +1551,18 @@ 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->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 = next_ino++; - if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0) + if (inode_set_symlink(inode, to, w->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: @@ -1652,7 +1577,9 @@ static int wimfs_truncate(const char *path, off_t size) struct dentry *dentry; struct lookup_table_entry *lte; int ret; - unsigned stream_idx; + u16 stream_idx; + u32 stream_id; + struct inode *inode; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e, &stream_idx); @@ -1663,18 +1590,26 @@ static int wimfs_truncate(const char *path, off_t size) if (!lte) /* Already a zero-length file */ return 0; - if (lte->staging_file_name) { + inode = dentry->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); if (ret != 0) return -errno; lte->resource_entry.original_size = size; } else { + 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, + ret = extract_resource_to_staging_dir(inode, stream_id, <e, size); } - dentry_link_group_update_times(dentry); return ret; } @@ -1683,8 +1618,10 @@ static int wimfs_unlink(const char *path) { struct dentry *dentry; struct lookup_table_entry *lte; + struct inode *inode; int ret; - unsigned stream_idx; + u16 stream_idx; + unsigned i; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e, &stream_idx); @@ -1692,21 +1629,14 @@ static int wimfs_unlink(const char *path) if (ret != 0) return ret; - if (stream_idx == 0) { - /* We are removing the full dentry including all alternate data - * streams. */ + if (stream_idx == 0) remove_dentry(dentry, w->lookup_table); - } else { - /* We are removing an alternate data stream. */ - remove_ads(dentry, &dentry->ads_entries[stream_idx - 1], - w->lookup_table); - } - /* Beware: The lookup table entry(s) may still be referenced by users - * that have opened the corresponding streams. They are freed later in - * wimfs_release() when the last file user has closed the stream. */ + else + inode_remove_ads(dentry->inode, stream_idx - 1, w->lookup_table); return 0; } +#ifdef HAVE_UTIMENSAT /* * Change the timestamp on a file dentry. * @@ -1714,25 +1644,42 @@ static int wimfs_unlink(const char *path) */ static int wimfs_utimens(const char *path, const struct timespec tv[2]) { - struct dentry *dentry = get_dentry(w, path); + struct dentry *dentry; + struct inode *inode; + dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - u64 times[3] = {0, 0, 0}; + inode = dentry->inode; + if (tv[0].tv_nsec != UTIME_OMIT) { if (tv[0].tv_nsec == UTIME_NOW) - times[2] = get_wim_timestamp(); + inode->last_access_time = get_wim_timestamp(); else - times[2] = timespec_to_wim_timestamp(&tv[0]); + inode->last_access_time = timespec_to_wim_timestamp(&tv[0]); } if (tv[1].tv_nsec != UTIME_OMIT) { if (tv[1].tv_nsec == UTIME_NOW) - times[1] = get_wim_timestamp(); + inode->last_write_time = get_wim_timestamp(); else - times[1] = timespec_to_wim_timestamp(&tv[1]); + inode->last_write_time = timespec_to_wim_timestamp(&tv[1]); } - dentry_link_group_set_times(dentry, times); return 0; } +#else +static int wimfs_utime(const char *path, struct utimbuf *times) +{ + struct dentry *dentry; + struct inode *inode; + dentry = get_dentry(w, path); + if (!dentry) + return -ENOENT; + inode = dentry->inode; + + inode->last_write_time = unix_timestamp_to_wim(times->modtime); + inode->last_access_time = unix_timestamp_to_wim(times->actime); + return 0; +} +#endif /* Writes to a file in the WIM filesystem. * It may be an alternate data stream, but here we don't even notice because we @@ -1742,11 +1689,15 @@ static int wimfs_write(const char *path, const char *buf, size_t size, { struct wimlib_fd *fd = (struct wimlib_fd*)(uintptr_t)fi->fh; int ret; + u64 now; + + if (!fd) + return -EBADF; - wimlib_assert(fd); wimlib_assert(fd->lte); wimlib_assert(fd->lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); + wimlib_assert(fd->inode); /* Seek to the requested position */ if (lseek(fd->staging_fd, offset, SEEK_SET) == -1) @@ -1757,12 +1708,9 @@ static int wimfs_write(const char *path, const char *buf, size_t size, if (ret == -1) return -errno; - if (fd->dentry) { - u64 now = get_wim_timestamp(); - u64 times[3] = {0, now, now}; - dentry_link_group_set_times(fd->dentry, times); - } - + now = get_wim_timestamp(); + fd->inode->last_write_time = now; + fd->inode->last_access_time = now; return ret; } @@ -1802,51 +1750,15 @@ static struct fuse_operations wimfs_operations = { .symlink = wimfs_symlink, .truncate = wimfs_truncate, .unlink = wimfs_unlink, +#ifdef HAVE_UTIMENSAT .utimens = wimfs_utimens, +#else + .utime = wimfs_utime, +#endif .write = wimfs_write, }; -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, int flags, WIMStruct **additional_swms, @@ -1857,6 +1769,7 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, int ret; char *p; struct lookup_table *joined_tab, *wim_tab_save; + struct image_metadata *imd; DEBUG("Mount: wim = %p, image = %d, dir = %s, flags = %d, ", wim, image, dir, flags); @@ -1883,23 +1796,21 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, if (ret != 0) goto out; + imd = &wim->image_metadata[image - 1]; + DEBUG("Selected image %d", image); - next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt); + next_ino = assign_inode_numbers(&imd->inode_list); + + DEBUG("(next_ino = %"PRIu64")", next_ino); - 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, + DEBUG("Resolving lookup table entries"); + for_dentry_in_tree(imd->root_dentry, dentry_resolve_ltes, wim->lookup_table); - DEBUG("Checking lookup table entry reference counts"); - - ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL); - if (ret != 0) - goto out; - if (flags & WIMLIB_MOUNT_FLAG_READWRITE) - wim_get_current_image_metadata(wim)->modified = true; + imd->modified = true; if (!(flags & (WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_NONE | WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR | @@ -2010,6 +1921,30 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) int msgsize; int errno_save; + mount_dir = dir; + + /* Open message queues between the unmount process and the + * filesystem daemon. */ + ret = open_message_queues(false); + if (ret != 0) + return ret; + + /* Send a message to the filesystem 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); + if (ret == -1) { + ERROR("Failed to notify filesystem daemon whether we want to " + "commit changes or not"); + close_message_queues(); + return WIMLIB_ERR_MQUEUE; + } + /* Execute `fusermount -u', which is installed setuid root, to unmount * the WIM. * @@ -2022,7 +1957,7 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) * the WIM file. */ - mount_dir = dir; + pid = fork(); if (pid == -1) { ERROR_WITH_ERRNO("Failed to fork()"); @@ -2031,10 +1966,10 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) if (pid == 0) { execlp("fusermount", "fusermount", "-u", dir, NULL); ERROR_WITH_ERRNO("Failed to execute `fusermount'"); - return WIMLIB_ERR_FUSERMOUNT; + exit(WIMLIB_ERR_FUSERMOUNT); } - ret = waitpid(pid, &status, 0); + ret = wait(&status); if (ret == -1) { ERROR_WITH_ERRNO("Failed to wait for fusermount process to " "terminate"); @@ -2043,31 +1978,35 @@ WIMLIBAPI int wimlib_unmount(const char *dir, int flags) if (status != 0) { ERROR("fusermount exited with status %d", status); - return WIMLIB_ERR_FUSERMOUNT; - } - /* Open message queues between the unmount process and the - * filesystem daemon. */ - ret = open_message_queues(false); - if (ret != 0) - return ret; + /* Try again, but with the `umount' program. This is required + * on other FUSE implementations such as FreeBSD's that do not + * have a `fusermount' program. */ - /* Send a message to the filesystem 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; + pid = fork(); + if (pid == -1) { + ERROR_WITH_ERRNO("Failed to fork()"); + return WIMLIB_ERR_FORK; + } + if (pid == 0) { + execlp("umount", "umount", dir, NULL); + ERROR_WITH_ERRNO("Failed to execute `umount'"); + exit(WIMLIB_ERR_FUSERMOUNT); + } - 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); - if (ret == -1) { - ERROR("Failed to notify filesystem daemon whether we want to " - "commit changes or not"); - close_message_queues(); - return WIMLIB_ERR_MQUEUE; + ret = wait(&status); + if (ret == -1) { + ERROR_WITH_ERRNO("Failed to wait for `umount' process to " + "terminate"); + return WIMLIB_ERR_FUSERMOUNT; + } + if (status != 0) { + ERROR("`umount' exited with failure status"); + return WIMLIB_ERR_FUSERMOUNT; + } } + /* Wait for a message from the filesytem daemon indicating whether the * filesystem was unmounted successfully (0) or an error occurred (1). * This may take a long time if a big WIM file needs to be rewritten. */