X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=19e8d5d700a573b39063a8f69b89ae44daecece2;hp=b8fe52784c0d85b4603e0f9eb85432337f4f0078;hb=200bd141bea66770dd9845a95f2403d59956b931;hpb=004c7fd634328ab9b3c4b479097a10ca12ae38d7 diff --git a/src/mount.c b/src/mount.c index b8fe5278..19e8d5d7 100644 --- a/src/mount.c +++ b/src/mount.c @@ -73,6 +73,12 @@ 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; + +/* List of lookup table entries in the staging directory */ +static LIST_HEAD(staging_list); static inline int get_lookup_flags() { @@ -82,11 +88,15 @@ static inline int get_lookup_flags() return 0; } +/* Returns nonzero if write permission is requested on the file open flags */ 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, struct wimlib_fd **fd_ret) { @@ -101,13 +111,12 @@ static int alloc_wimlib_fd(struct lookup_table_entry *lte, return -EMFILE; num_new_fds = min(fds_per_alloc, max_fds - lte->num_allocated_fds); - fds = CALLOC(lte->num_allocated_fds + num_new_fds, - sizeof(lte->fds[0])); + fds = REALLOC(lte->fds, (lte->num_allocated_fds + num_new_fds) * + sizeof(lte->fds[0])); if (!fds) return -ENOMEM; - memcpy(fds, lte->fds, - lte->num_allocated_fds * sizeof(lte->fds[0])); - FREE(lte->fds); + memset(&fds[lte->num_allocated_fds], 0, + num_new_fds * sizeof(fds[0])); lte->fds = fds; lte->num_allocated_fds += num_new_fds; } @@ -139,28 +148,35 @@ 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->num_opened_fds == 0 && lte->refcnt == 0) { + if (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); return 0; } +/* Remove a dentry and all its alternate file streams */ static void remove_dentry(struct dentry *dentry, struct lookup_table *lookup_table) { - const u8 *hash = dentry->hash; + wimlib_assert(dentry); + wimlib_assert(dentry->resolved); + + struct lookup_table_entry *lte = dentry->lte; u16 i = 0; - struct lookup_table_entry *lte; while (1) { - lte = lookup_table_decrement_refcnt(lookup_table, hash); + 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; - hash = dentry->ads_entries[i].hash; + lte = dentry->ads_entries[i].lte; i++; } @@ -168,21 +184,47 @@ static void remove_dentry(struct dentry *dentry, put_dentry(dentry); } -static void dentry_increment_lookup_table_refcnts(struct dentry *dentry, - struct lookup_table *lookup_table) +/* Transfers file attributes from a struct dentry to a `stat' buffer. */ +int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) { - u16 i = 0; - const u8 *hash = dentry->hash; struct lookup_table_entry *lte; - while (1) { - lte = __lookup_resource(lookup_table, hash); - if (lte) - lte->refcnt++; - if (i == dentry->num_ads) - break; - hash = dentry->ads_entries[i].hash; - i++; + + if (dentry_is_symlink(dentry)) + stbuf->st_mode = S_IFLNK | 0777; + else if (dentry_is_directory(dentry)) + stbuf->st_mode = S_IFDIR | 0755; + else + stbuf->st_mode = S_IFREG | 0644; + + stbuf->st_ino = (ino_t)dentry->hard_link; + + stbuf->st_nlink = dentry_link_group_size(dentry); + stbuf->st_uid = getuid(); + stbuf->st_gid = getgid(); + + /* Use the size of the unnamed (default) file stream. */ + lte = dentry_first_lte_resolved(dentry); + if (lte) { + if (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(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_blocks = (stbuf->st_size + 511) / 512; + return 0; } /* Creates a new staging file and returns its file descriptor opened for @@ -201,7 +243,7 @@ static int create_staging_file(char **name_ret, int open_flags) int fd; int errno_save; - name_len = staging_dir_name_len + 1 + WIM_HASH_SIZE; + name_len = staging_dir_name_len + 1 + SHA1_HASH_SIZE; name = MALLOC(name_len + 1); if (!name) { errno = ENOMEM; @@ -213,7 +255,7 @@ static int create_staging_file(char **name_ret, int open_flags) 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, - WIM_HASH_SIZE); + SHA1_HASH_SIZE); name[name_len] = '\0'; @@ -240,18 +282,116 @@ 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) +{ + int ret; + 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->hard_link == 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->hard_link == 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->hard_link == dentry->hard_link); + 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. * - * 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 + * @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) + * + * @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 + * + * @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, struct lookup_table_entry **lte, off_t size) { @@ -261,6 +401,23 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, 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); if (fd == -1) @@ -286,75 +443,54 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, 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. */ - lookup_table_remove(w->lookup_table, old_lte); + DEBUG("Re-using lookup table entry"); + lookup_table_unlink(w->lookup_table, old_lte); new_lte = old_lte; } else { + DEBUG("Splitting lookup table entry " + "(link_group_size = %u, 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 + /* 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. */ + * streams themselves are not hardlinked. + * XXX*/ wimlib_assert(old_lte->refcnt > link_group_size); - new_lte = new_lookup_table_entry(); + new_lte = lte_extract_fds(old_lte, dentry->hard_link); if (!new_lte) { ret = -ENOMEM; goto out_delete_staging_file; } - u16 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->hard_link == - dentry->hard_link) - { - num_transferred_fds++; - } - } - new_lte->fds = MALLOC(num_transferred_fds * - sizeof(new_lte->fds[0])); - if (!new_lte->fds) { - free_lookup_table_entry(new_lte); - ret = -ENOMEM; - goto out_delete_staging_file; - } - u16 j = 0; - for (u16 i = 0; i < old_lte->num_allocated_fds; i++) { - if (old_lte->fds[i] && - old_lte->fds[i]->dentry->hard_link == - dentry->hard_link) - { - 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; - } - } + lte_transfer_stream_entries(new_lte, dentry, stream_idx); old_lte->refcnt -= link_group_size; - old_lte->num_opened_fds -= j; - new_lte->num_opened_fds = j; - } } 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); } new_lte->resource_entry.original_size = size; new_lte->refcnt = link_group_size; - randomize_byte_array(new_lte->hash, WIM_HASH_SIZE); + random_hash(new_lte->hash); new_lte->staging_file_name = staging_file_name; lookup_table_insert(w->lookup_table, new_lte); + list_add(&new_lte->staging_list, &staging_list); *lte = new_lte; return 0; out_delete_staging_file: @@ -597,60 +733,83 @@ static int wimfs_access(const char *path, int mask) /* 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, void *ignore) +static int close_lte_fds(struct lookup_table_entry *lte) { - for (u16 i = 0; i < lte->num_opened_fds; i++) { + for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) { if (lte->fds[i] && lte->fds[i]->staging_fd != -1) { 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; } +static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, + struct lookup_table_entry *newptr) +{ + 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); + + struct dentry *dentry; + dentry = container_of(head, struct dentry, lte_group_list); -/* Calculates the SHA1 sum for @dentry if its file resource is in a staging - * file. Updates the SHA1 sum in the dentry and the lookup table entry. If - * there is already a lookup table entry with the same checksum, increment its - * reference count and destroy the lookup entry with the updated checksum. */ -static int calculate_sha1sum_for_staging_file(struct dentry *dentry, - void *_lookup_table) + dentry->lte = newptr; + } + } +} + + +static int update_lte_of_staging_file(struct lookup_table_entry *lte, + struct lookup_table *table) { - struct lookup_table *lookup_table = _lookup_table; - u8 *hash = dentry->hash; - u16 i = 0; - while (1) { - struct lookup_table_entry *lte = __lookup_resource(lookup_table, hash); - if (lte && lte->staging_file_name) { - struct lookup_table_entry *existing; - int ret; - - DEBUG("Calculating SHA1 hash for file `%s'", - dentry->file_name_utf8); - ret = sha1sum(lte->staging_file_name, lte->hash); - if (ret != 0) - return ret; - - lookup_table_unlink(lookup_table, lte); - memcpy(hash, lte->hash, WIM_HASH_SIZE); - existing = __lookup_resource(lookup_table, hash); - if (existing) { - DEBUG("Merging duplicate lookup table entries for file " - "`%s'", dentry->file_name_utf8); - free_lookup_table_entry(lte); - existing->refcnt++; - } else { - lookup_table_insert(lookup_table, lte); - } + struct lookup_table_entry *duplicate_lte; + int ret; + u8 hash[SHA1_HASH_SIZE]; + struct stat stbuf; + + wimlib_assert(lte->staging_file_name); + + ret = sha1sum(lte->staging_file_name, hash); + if (ret != 0) + return ret; + + + lookup_table_unlink(table, lte); + + duplicate_lte = __lookup_resource(table, hash); + + if (duplicate_lte) { + /* Merge duplicate lookup table entries */ + + lte_list_change_lte_ptr(lte, duplicate_lte); + duplicate_lte->refcnt += lte->refcnt; + list_splice(<e->lte_group_list, + &duplicate_lte->lte_group_list); + + free_lookup_table_entry(lte); + } else { + if (stat(lte->staging_file_name, &stbuf) != 0) { + ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name); + return WIMLIB_ERR_STAT; } - if (i == dentry->num_ads) - break; - hash = dentry->ads_entries[i].hash; - i++; + copy_hash(lte->hash, hash); + lte->resource_entry.original_size = stbuf.st_size; + lookup_table_insert(table, lte); } + return 0; } @@ -658,27 +817,26 @@ static int calculate_sha1sum_for_staging_file(struct dentry *dentry, static int rebuild_wim(WIMStruct *w, bool check_integrity) { int ret; - struct dentry *root; - - root = wim_root_dentry(w); + struct lookup_table_entry *lte, *tmp; - DEBUG("Closing all staging file descriptors."); /* Close all the staging file descriptors. */ - ret = for_lookup_table_entry(w->lookup_table, close_lte_fds, NULL); - if (ret != 0) { - ERROR("Failed to close all staging files"); - return ret; + 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; } - DEBUG("Calculating SHA1 checksums for all new staging files."); /* Calculate SHA1 checksums for all staging files, and merge unnecessary * lookup table entries. */ - ret = for_dentry_in_tree(root, calculate_sha1sum_for_staging_file, - w->lookup_table); - if (ret != 0) { - ERROR("Failed to calculate new SHA1 checksums"); - return ret; + 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); + if (ret != 0) + return ret; } + if (ret != 0) + return ret; xml_update_image_info(w, w->current_image); @@ -693,7 +851,6 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity) /* Called when the filesystem is unmounted. */ static void wimfs_destroy(void *p) { - /* For read-write mounts, the `imagex unmount' command, which is * running in a separate process and is executing the * wimlib_unmount() function, will send this process a byte @@ -758,20 +915,30 @@ static void wimfs_destroy(void *p) 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); if (ret == -1) ERROR_WITH_ERRNO("Failed to send status to unmount process"); close_message_queues(); } +static int wimfs_fallocate(const char *path, int mode, + off_t offset, off_t len, struct fuse_file_info *fi) +{ + struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh; + wimlib_assert(fd->staging_fd != -1); + return fallocate(fd->staging_fd, mode, offset, len); +} + static int wimfs_fgetattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi) { struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh; - dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table); - return 0; + return dentry_to_stbuf(fd->dentry, stbuf); } static int wimfs_ftruncate(const char *path, off_t size, @@ -793,8 +960,14 @@ static int wimfs_getattr(const char *path, struct stat *stbuf) struct dentry *dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - dentry_to_stbuf(dentry, stbuf, w->lookup_table); - return 0; + return dentry_to_stbuf(dentry, stbuf); +} + +static int wimfs_getxattr(const char *path, const char *name, char *value, + size_t size) +{ + /* XXX */ + return -ENOTSUP; } /* Create a hard link */ @@ -825,12 +998,36 @@ static int wimfs_link(const char *to, const char *from) 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++; + } + + /* The ADS entries are owned by another dentry. */ + from_dentry->ads_entries_status = ADS_ENTRIES_USER; + link_dentry(from_dentry, from_dentry_parent); - dentry_increment_lookup_table_refcnts(from_dentry, w->lookup_table); return 0; } +static int wimfs_listxattr(const char *path, char *list, size_t size) +{ + /* XXX */ + return -ENOTSUP; +} + /* * Create a directory in the WIM. * @mode is currently ignored. @@ -854,6 +1051,8 @@ static int wimfs_mkdir(const char *path, mode_t mode) newdir = new_dentry(basename); newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY; + newdir->resolved = true; + newdir->hard_link = next_link_group_id++; link_dentry(newdir, parent); return 0; } @@ -865,6 +1064,7 @@ 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) && (stream_name = path_stream_name(path))) { + /* Make an alternate data stream */ struct ads_entry *new_entry; struct dentry *dentry; @@ -880,6 +1080,8 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) struct dentry *dentry, *parent; const char *basename; + /* Make a normal file (not an alternate data stream) */ + /* 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); @@ -895,6 +1097,10 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) dentry = new_dentry(basename); if (!dentry) return -ENOMEM; + dentry->resolved = true; + dentry->hard_link = next_link_group_id++; + dentry->lte_group_list.type = STREAM_TYPE_NORMAL; + INIT_LIST_HEAD(&dentry->lte_group_list.list); link_dentry(dentry, parent); } return 0; @@ -909,9 +1115,10 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) u8 *dentry_hash; int ret; struct wimlib_fd *fd; + unsigned stream_idx; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, <e, - &dentry_hash); + &stream_idx); if (ret != 0) return ret; @@ -926,10 +1133,10 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) return 0; } - ret = extract_resource_to_staging_dir(dentry, <e, 0); + ret = extract_resource_to_staging_dir(dentry, stream_idx, + <e, 0); if (ret != 0) return ret; - memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE); } ret = alloc_wimlib_fd(lte, &fd); @@ -946,11 +1153,10 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) * but we need to extract the resource to the staging directory * if we are opening it writable. */ if (flags_writable(fi->flags) && !lte->staging_file_name) { - ret = extract_resource_to_staging_dir(dentry, <e, + ret = extract_resource_to_staging_dir(dentry, stream_idx, <e, lte->resource_entry.original_size); if (ret != 0) return ret; - memcpy(dentry_hash, lte->hash, WIM_HASH_SIZE); } if (lte->staging_file_name) { fd->staging_fd = open(lte->staging_file_name, fi->flags); @@ -994,6 +1200,8 @@ static int wimfs_read(const char *path, char *buf, size_t size, return 0; } + wimlib_assert(fd->lte); + if (fd->lte->staging_file_name) { /* Read from staging file */ @@ -1009,7 +1217,6 @@ static int wimfs_read(const char *path, char *buf, size_t size, return -errno; return ret; } else { - /* Read from WIM */ struct resource_entry *res_entry; @@ -1036,11 +1243,12 @@ 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, - off_t offset, struct fuse_file_info *fi) + off_t offset, struct fuse_file_info *fi) { struct dentry *parent, *child; parent = (struct dentry*)fi->fh; + wimlib_assert(parent); child = parent->children; filler(buf, ".", NULL, 0); @@ -1087,7 +1295,7 @@ static int wimfs_release(const char *path, struct fuse_file_info *fi) } if (flags_writable(fi->flags) && fd->dentry) { - u64 now = get_timestamp(); + u64 now = get_wim_timestamp(); fd->dentry->last_access_time = now; fd->dentry->last_write_time = now; } @@ -1099,12 +1307,19 @@ static int wimfs_releasedir(const char *path, struct fuse_file_info *fi) { struct dentry *dentry = (struct dentry *)fi->fh; + wimlib_assert(dentry); wimlib_assert(dentry->num_times_opened); if (--dentry->num_times_opened == 0) free_dentry(dentry); return 0; } +static int wimfs_removexattr(const char *path, const char *name) +{ + /* XXX */ + return -ENOTSUP; +} + /* Renames a file or directory. See rename (3) */ static int wimfs_rename(const char *from, const char *to) { @@ -1132,6 +1347,8 @@ static int wimfs_rename(const char *from, const char *to) return -ENOMEM; if (dst) { + /* Destination file exists */ + if (src == dst) /* Same file */ return 0; @@ -1150,9 +1367,13 @@ static int wimfs_rename(const char *from, const char *to) parent_of_dst = dst->parent; remove_dentry(dst, w->lookup_table); } else { + /* Destination does not exist */ parent_of_dst = get_parent_dentry(w, to); if (!parent_of_dst) return -ENOENT; + + if (!dentry_is_directory(parent_of_dst)) + return -ENOTDIR; } FREE(src->file_name); @@ -1185,10 +1406,18 @@ static int wimfs_rmdir(const char *path) return 0; } +static int wimfs_setxattr(const char *path, const char *name, + const char *value, size_t size, int flags) +{ + /* XXX */ + return -ENOTSUP; +} + 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); if (!dentry_parent) @@ -1206,10 +1435,18 @@ static int wimfs_symlink(const char *to, const char *from) dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + dentry->hard_link = next_link_group_id++; - if (dentry_set_symlink(dentry, to, w->lookup_table) != 0) + if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 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: @@ -1224,10 +1461,10 @@ static int wimfs_truncate(const char *path, off_t size) struct dentry *dentry; struct lookup_table_entry *lte; int ret; - u8 *dentry_hash; + unsigned stream_idx; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, - <e, &dentry_hash); + <e, &stream_idx); if (ret != 0) return ret; @@ -1243,7 +1480,8 @@ static int wimfs_truncate(const char *path, off_t size) } else { /* File in WIM. Extract it to the staging directory, but only * the first @size bytes of it. */ - ret = extract_resource_to_staging_dir(dentry, <e, size); + ret = extract_resource_to_staging_dir(dentry, stream_idx, + <e, size); } dentry_update_all_timestamps(dentry); return ret; @@ -1256,29 +1494,27 @@ static int wimfs_unlink(const char *path) struct lookup_table_entry *lte; int ret; u8 *dentry_hash; + unsigned stream_idx; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, - <e, &dentry_hash); + <e, &stream_idx); if (ret != 0) return ret; - if (lte && lte->staging_file_name) - if (unlink(lte->staging_file_name) != 0) - return -errno; - - if (dentry_hash == dentry->hash) { + if (stream_idx == 0) { /* We are removing the full dentry including all alternate data * streams. */ remove_dentry(dentry, w->lookup_table); } else { /* We are removing an alternate data stream. */ - struct ads_entry *cur_entry = dentry->ads_entries; - while (cur_entry->hash != dentry_hash) - cur_entry++; - lookup_table_decrement_refcnt(w->lookup_table, cur_entry->hash); + struct ads_entry *ads_entry; - dentry_remove_ads(dentry, cur_entry); + ads_entry = &dentry->ads_entries[stream_idx - 1]; + lte = lte_decrement_refcnt(lte, w->lookup_table); + if (lte) + list_del(&ads_entry->lte_group_list.list); + dentry_remove_ads(dentry, ads_entry); } /* Beware: The lookup table entry(s) may still be referenced by users * that have opened the corresponding streams. They are freed later in @@ -1286,20 +1522,28 @@ static int wimfs_unlink(const char *path) return 0; } -/* Change the timestamp on a file dentry. +/* + * Change the timestamp on a file dentry. * - * There is no distinction between a file and its alternate data streams here. */ + * Note that alternate data streams do not have their own timestamps. + */ static int wimfs_utimens(const char *path, const struct timespec tv[2]) { struct dentry *dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - time_t last_access_t = (tv[0].tv_nsec == UTIME_NOW) ? - time(NULL) : tv[0].tv_sec; - dentry->last_access_time = unix_timestamp_to_ms(last_access_t); - time_t last_mod_t = (tv[1].tv_nsec == UTIME_NOW) ? - time(NULL) : tv[1].tv_sec; - dentry->last_write_time = unix_timestamp_to_ms(last_mod_t); + if (tv[0].tv_nsec != UTIME_OMIT) { + if (tv[0].tv_nsec == UTIME_NOW) + dentry->last_access_time = get_wim_timestamp(); + else + dentry->last_access_time = timespec_to_wim_timestamp(&tv[0]); + } + if (tv[1].tv_nsec != UTIME_OMIT) { + if (tv[1].tv_nsec == UTIME_NOW) + dentry->last_write_time = get_wim_timestamp(); + else + dentry->last_write_time = timespec_to_wim_timestamp(&tv[1]); + } return 0; } @@ -1312,10 +1556,15 @@ static int wimfs_write(const char *path, const char *buf, size_t size, struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh; int ret; + wimlib_assert(fd); wimlib_assert(fd->lte); wimlib_assert(fd->lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); + /* Seek to the requested position */ + if (lseek(fd->staging_fd, offset, SEEK_SET) == -1) + return -errno; + /* Write the data. */ ret = write(fd->staging_fd, buf, size); if (ret == -1) @@ -1324,39 +1573,61 @@ static int wimfs_write(const char *path, const char *buf, size_t size, return ret; } - static struct fuse_operations wimfs_operations = { - .access = wimfs_access, - .destroy = wimfs_destroy, - .fgetattr = wimfs_fgetattr, - .ftruncate = wimfs_ftruncate, - .getattr = wimfs_getattr, - .link = wimfs_link, - .mkdir = wimfs_mkdir, - .mknod = wimfs_mknod, - .open = wimfs_open, - .opendir = wimfs_opendir, - .read = wimfs_read, - .readdir = wimfs_readdir, - .readlink = wimfs_readlink, - .release = wimfs_release, - .releasedir = wimfs_releasedir, - .rename = wimfs_rename, - .rmdir = wimfs_rmdir, - .symlink = wimfs_symlink, - .truncate = wimfs_truncate, - .unlink = wimfs_unlink, - .utimens = wimfs_utimens, - .write = wimfs_write, + .access = wimfs_access, + .destroy = wimfs_destroy, + .fallocate = wimfs_fallocate, + .fgetattr = wimfs_fgetattr, + .ftruncate = wimfs_ftruncate, + .getattr = wimfs_getattr, + .getxattr = wimfs_getxattr, + .link = wimfs_link, + .listxattr = wimfs_listxattr, + .mkdir = wimfs_mkdir, + .mknod = wimfs_mknod, + .open = wimfs_open, + .opendir = wimfs_opendir, + .read = wimfs_read, + .readdir = wimfs_readdir, + .readlink = wimfs_readlink, + .release = wimfs_release, + .releasedir = wimfs_releasedir, + .removexattr = wimfs_removexattr, + .rename = wimfs_rename, + .rmdir = wimfs_rmdir, + .setxattr = wimfs_setxattr, + .symlink = wimfs_symlink, + .truncate = wimfs_truncate, + .unlink = wimfs_unlink, + .utimens = wimfs_utimens, + .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 + ERROR("The following lookup table entry has a reference count " + "of %u, but", lte->refcnt); + ERROR("We found %u references to it", lte_group_size); + print_lookup_table_entry(lte); +#endif + return WIMLIB_ERR_INVALID_DENTRY; + } + return 0; +} + /* Mounts a WIM file. */ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, int flags) { int argc = 0; - char *argv[6]; + char *argv[16]; int ret; char *p; @@ -1368,6 +1639,18 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, ret = wimlib_select_image(wim, image); + if (ret != 0) + return ret; + + DEBUG("Selected image %d", image); + + next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt); + + /* Resolve all the lookup table entries of the dentry tree */ + for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes, + wim->lookup_table); + + ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL); if (ret != 0) return ret; @@ -1394,19 +1677,31 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, argv[argc++] = p; argv[argc++] = "-s"; /* disable multi-threaded operation */ - if (flags & WIMLIB_MOUNT_FLAG_DEBUG) { + if (flags & WIMLIB_MOUNT_FLAG_DEBUG) argv[argc++] = "-d"; - } - if (!(flags & WIMLIB_MOUNT_FLAG_READWRITE)) { - argv[argc++] = "-o"; - argv[argc++] = "ro"; - } else { + + /* + * 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. + */ + char optstring[256] = "use_ino"; + 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); return WIMLIB_ERR_MKDIR; } + } else { + /* Read-only mount */ + strcat(optstring, ",ro"); } + argv[argc] = NULL; #ifdef ENABLE_DEBUG { @@ -1513,7 +1808,10 @@ 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? + * */ gettimeofday(&now, NULL); timeout.tv_sec = now.tv_sec + 600;