X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=9385b5298975f41bf6b60d797cd92ac36a7338b7;hp=ca6197cedb491e28a732968461dcd9e9096a971f;hb=68b023ab834029db11ce9bf150dadd9c80e59404;hpb=0bf41495dd9e04585be10794d7745a5baa7165a5 diff --git a/src/mount.c b/src/mount.c index ca6197ce..9385b529 100644 --- a/src/mount.c +++ b/src/mount.c @@ -44,6 +44,7 @@ #include #include #include +#include struct wimlib_fd { u16 idx; @@ -88,11 +89,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) { @@ -107,13 +112,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; } @@ -140,36 +144,43 @@ static int close_wimlib_fd(struct wimlib_fd *fd) wimlib_assert(lte); wimlib_assert(lte->num_opened_fds); - if (lte->staging_file_name) { + 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) return -errno; } if (--lte->num_opened_fds == 0 && lte->refcnt == 0) { - if (lte->staging_file_name) + 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); 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++; } @@ -177,21 +188,18 @@ 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) +static void remove_ads(struct dentry *dentry, + struct ads_entry *ads_entry, + struct lookup_table *lookup_table) { - 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++; - } + + wimlib_assert(dentry->resolved); + + lte = lte_decrement_refcnt(lte, lookup_table); + if (lte) + list_del(&ads_entry->lte_group_list.list); + dentry_remove_ads(dentry, ads_entry); } /* Transfers file attributes from a struct dentry to a `stat' buffer. */ @@ -213,11 +221,16 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) stbuf->st_gid = getgid(); /* Use the size of the unnamed (default) file stream. */ - if ((lte = dentry_lte(dentry))) { - if (lte->staging_file_name) { + lte = dentry_unnamed_lte_resolved(dentry); + if (lte) { + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { + wimlib_assert(lte->staging_file_name); struct stat native_stat; - if (stat(lte->staging_file_name, &native_stat) != 0) + 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; @@ -226,41 +239,13 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf) stbuf->st_size = 0; } - stbuf->st_atime = ms_timestamp_to_unix(dentry->last_access_time); - stbuf->st_mtime = ms_timestamp_to_unix(dentry->last_write_time); - stbuf->st_ctime = ms_timestamp_to_unix(dentry->creation_time); + 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; } -#if 0 -/* Change the hash value of the main or alternate file stream in a hard link - * group. This needs to be done if the hash of the corresponding lookup table - * entry was changed. */ -static void link_group_set_stream_hash(struct dentry *dentry, - unsigned stream_idx, - const u8 new_hash[]) -{ - struct list_head *head, *cur; - - if (stream_idx == 0) { - head = &dentry->link_group_list; - cur = head; - do { - dentry = container_of(cur, struct dentry, link_group_list); - memcpy(dentry->hash, new_hash, WIM_HASH_SIZE); - cur = cur->next; - } while (cur != head); - } else { - /* Dentries in the link group share their alternate stream - * entries. */ - wimlib_assert(stream_idx <= dentry->num_ads); - memcpy(dentry->ads_entries[stream_idx - 1].hash, new_hash, - WIM_HASH_SIZE); - } -} -#endif - /* Creates a new staging file and returns its file descriptor opened for * writing. * @@ -277,7 +262,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; @@ -289,7 +274,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'; @@ -316,10 +301,12 @@ 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 +/* + * 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. */ + * 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) { @@ -333,7 +320,7 @@ lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group) num_transferred_fds = 0; for (u16 i = 0; i < old_lte->num_allocated_fds; i++) - if (old_lte->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", @@ -344,7 +331,7 @@ lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group) return NULL; } for (u16 i = 0, j = 0; ; i++) { - if (old_lte->fds[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; @@ -355,6 +342,8 @@ lte_extract_fds(struct lookup_table_entry *old_lte, u64 link_group) 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; @@ -378,6 +367,8 @@ static void lte_transfer_ads_entry(struct lookup_table_entry *new_lte, 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; @@ -389,89 +380,34 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte, { INIT_LIST_HEAD(&new_lte->lte_group_list); if (stream_idx == 0) { - struct list_head *pos; + 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); } } -#if 0 -/* - * Transfers streams part of a hard-link group from @old_lte to @new_lte. - * - * @dentry is one of the dentries in the hard link group - * @stream_idx is the index of the stream that we're transferring. - */ -static void lte_transfer_stream_entries(struct lookup_table_entry *old_lte, - 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; - struct stream_list_head *head; - struct dentry *other_dentry; - list_for_each(pos, &old_lte->lte_group_list) { - head = container_of(pos, struct stream_list_head, head); - if (head->type != STREAM_TYPE_NORMAL) { - continue; - other_dentry = container_of(head, struct dentry, - lte_group_list); - if (other_dentry->hard_link != dentry->link_group) - continue; - - list_del(&other_dentry->lte_group_list.list); - list_add(&other_dentry->lte_group_list.list, - &new_lte->lte_group_list); - other_dentry->lte = new_lte; - } - } else { - /* ADS entries are shared within a hard link group. */ - lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]); - } -} -static void lte__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 *cur; - do { - struct dentry *d; - - d = container_of(cur, struct dentry, link_group_list); - list_del(&d->lte_group_list); - list_add(&d->lte_group_list, &new_lte->lte_group_list); - d->lte = new_lte; - cur = cur->next; - } while (cur != &dentry->link_group_list); - } else { - lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]); - } -} -#endif - - /* * 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, @@ -484,6 +420,21 @@ 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; @@ -492,8 +443,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, return -errno; if (old_lte) - ret = extract_resource_to_fd(w, &old_lte->resource_entry, fd, - size); + ret = extract_wim_resource_to_fd(old_lte, fd, size); else ret = 0; if (ret != 0 || close(fd) != 0) { @@ -512,7 +462,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, /* 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_remove(w->lookup_table, old_lte); + lookup_table_unlink(w->lookup_table, old_lte); new_lte = old_lte; } else { DEBUG("Splitting lookup table entry " @@ -523,12 +473,14 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, * 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 = lte_extract_fds(old_lte, dentry->hard_link); @@ -552,8 +504,11 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, } 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); + 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; lookup_table_insert(w->lookup_table, new_lte); list_add(&new_lte->staging_list, &staging_list); @@ -803,6 +758,8 @@ static int close_lte_fds(struct lookup_table_entry *lte) { 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); @@ -814,46 +771,71 @@ static int close_lte_fds(struct lookup_table_entry *lte) 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_of_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->resource_location == RESOURCE_IN_STAGING_FILE); + 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++; + 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); } + return 0; } @@ -861,7 +843,7 @@ static int calculate_sha1sum_of_staging_file(struct dentry *dentry, static int rebuild_wim(WIMStruct *w, bool check_integrity) { int ret; - struct lookup_table_entry *lte; + struct lookup_table_entry *lte, *tmp; /* Close all the staging file descriptors. */ DEBUG("Closing all staging file descriptors."); @@ -874,8 +856,11 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity) /* Calculate SHA1 checksums for all staging files, and merge unnecessary * lookup table entries. */ DEBUG("Calculating SHA1 checksums for all new staging files."); - ret = for_dentry_in_tree(wim_root_dentry(w), - calculate_sha1sum_of_staging_file, w->lookup_table); + 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; @@ -956,8 +941,11 @@ 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"); @@ -995,17 +983,54 @@ static int wimfs_ftruncate(const char *path, off_t size, */ static int wimfs_getattr(const char *path, struct stat *stbuf) { - struct dentry *dentry = get_dentry(w, path); - if (!dentry) - return -ENOENT; + const char *stream_name; + char *p = NULL; + struct dentry *dentry; + int ret; + + ret = lookup_resource(w, path, + get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK, + &dentry, NULL, NULL); + if (ret != 0) + return ret; return dentry_to_stbuf(dentry, stbuf); } +/* Read an alternate data stream through the XATTR interface, or get its size */ static int wimfs_getxattr(const char *path, const char *name, char *value, size_t size) { - /* XXX */ - return -ENOTSUP; + int ret; + struct dentry *dentry; + struct ads_entry *ads_entry; + size_t res_size; + struct lookup_table_entry *lte; + + if (!(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) + return -ENOENT; + ads_entry = dentry_get_ads_entry(dentry, name); + if (!ads_entry) + return -ENOATTR; + + lte = ads_entry->lte; + res_size = wim_resource_size(lte); + + if (size == 0) + return res_size; + if (res_size > size) + return -ERANGE; + ret = read_full_wim_resource(lte, value); + if (ret != 0) + return -EIO; + return res_size; } /* Create a hard link */ @@ -1036,17 +1061,61 @@ 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); - from_dentry->link_group_master_status = GROUP_SLAVE; return 0; } static int wimfs_listxattr(const char *path, char *list, size_t size) { - /* XXX */ - return -ENOTSUP; + struct dentry *dentry; + int ret; + char *p = list; + size_t needed_size; + unsigned i; + if (!(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; + 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; + return needed_size; + } else { + for (i = 0; i < dentry->num_ads; i++) { + needed_size = dentry->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; + size -= needed_size; + } + return p - list; + } } /* @@ -1072,6 +1141,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; } @@ -1081,11 +1152,17 @@ static int wimfs_mkdir(const char *path, mode_t mode) static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev) { const char *stream_name; + const char *file_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; + char *p = (char*)stream_name - 1; + wimlib_assert(*p == ':'); + *p = '\0'; + dentry = get_dentry(w, path); if (!dentry || !dentry_is_regular_file(dentry)) return -ENOENT; @@ -1098,6 +1175,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); @@ -1113,7 +1192,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; @@ -1165,13 +1247,14 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) * 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->staging_file_name) { + 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->staging_file_name) { + if (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); @@ -1213,9 +1296,12 @@ static int wimfs_read(const char *path, char *buf, size_t size, return 0; } - if (fd->lte->staging_file_name) { + wimlib_assert(fd->lte); + + if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) { /* Read from staging file */ + wimlib_assert(fd->lte->staging_file_name); wimlib_assert(fd->staging_fd != -1); ssize_t ret; @@ -1228,25 +1314,18 @@ 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; - int ctype; + const struct resource_entry *res_entry; res_entry = &fd->lte->resource_entry; - ctype = wim_resource_compression_type(w, res_entry); - if (offset > res_entry->original_size) return -EOVERFLOW; size = min(size, res_entry->original_size - offset); - if (read_resource(w->fp, res_entry->size, - res_entry->original_size, - res_entry->offset, ctype, size, - offset, buf) != 0) + if (read_wim_resource(fd->lte, buf, size, offset, false) != 0) return -EIO; return size; } @@ -1255,11 +1334,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); @@ -1306,7 +1386,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; } @@ -1318,16 +1398,35 @@ 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; } +/* Remove an alternate data stream through the XATTR interface */ static int wimfs_removexattr(const char *path, const char *name) { - /* XXX */ - return -ENOTSUP; + struct dentry *dentry; + struct ads_entry *ads_entry; + int ret; + if (!(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) + return -ENOENT; + + ads_entry = dentry_get_ads_entry(dentry, name); + if (!ads_entry) + return -ENOATTR; + remove_ads(dentry, ads_entry, w->lookup_table); + return 0; } /* Renames a file or directory. See rename (3) */ @@ -1357,6 +1456,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; @@ -1375,9 +1476,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); @@ -1410,11 +1515,70 @@ static int wimfs_rmdir(const char *path) return 0; } +/* Write an alternate data stream through the XATTR interface */ static int wimfs_setxattr(const char *path, const char *name, const char *value, size_t size, int flags) { - /* XXX */ - return -ENOTSUP; + 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; + u8 value_hash[SHA1_HASH_SIZE]; + int ret; + int fd; + + if (!(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) + return -ENOENT; + existing_ads_entry = dentry_get_ads_entry(dentry, name); + if (existing_ads_entry) { + if (flags & XATTR_CREATE) + return -EEXIST; + remove_ads(dentry, existing_ads_entry, w->lookup_table); + } else { + if (flags & XATTR_REPLACE) + return -ENOATTR; + } + new_ads_entry = dentry_add_ads(dentry, name); + if (!new_ads_entry) + return -ENOMEM; + + sha1_buffer(value, size, value_hash); + + existing_lte = __lookup_resource(w->lookup_table, value_hash); + + if (existing_lte) { + lte = existing_lte; + lte->refcnt++; + } else { + char *value_copy; + lte = new_lookup_table_entry(); + if (!lte) + return -ENOMEM; + value_copy = MALLOC(size); + if (!value_copy) { + FREE(lte); + return -ENOMEM; + } + memcpy(value_copy, value, size); + lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER; + lte->attached_buffer = value_copy; + lte->resource_entry.original_size = size; + lte->resource_entry.size = size; + lte->resource_entry.flags = 0; + copy_hash(lte->hash, value_hash); + lookup_table_insert(w->lookup_table, lte); + } + new_ads_entry->lte = lte; + return 0; } static int wimfs_symlink(const char *to, const char *from) @@ -1439,14 +1603,17 @@ 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, <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); - dentry->ads_entries[1].lte = lte; + wimlib_assert(dentry->resolved); link_dentry(dentry, dentry_parent); return 0; @@ -1509,12 +1676,8 @@ static int wimfs_unlink(const char *path) remove_dentry(dentry, w->lookup_table); } else { /* We are removing an alternate data stream. */ - struct ads_entry *ads_entry; - - ads_entry = &dentry->ads_entries[stream_idx - 1]; - lte_decrement_refcnt(lte, w->lookup_table); - list_del(&ads_entry->lte_group_list.list); - dentry_remove_ads(dentry, ads_entry); + 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 @@ -1522,20 +1685,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; } @@ -1548,6 +1719,7 @@ 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); @@ -1564,7 +1736,6 @@ 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, @@ -1596,6 +1767,46 @@ 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 %u 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) @@ -1618,9 +1829,15 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, DEBUG("Selected image %d", image); - next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt); + next_link_group_id = assign_link_group_ids(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); - resolve_lookup_table_entries(wim_root_dentry(wim), w->lookup_table); + ret = for_lookup_table_entry(wim->lookup_table, check_lte_refcnt, NULL); + if (ret != 0) + return ret; if (flags & WIMLIB_MOUNT_FLAG_READWRITE) wim_get_current_image_metadata(wim)->modified = true; @@ -1641,23 +1858,32 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, if (!p) return WIMLIB_ERR_NOMEM; - argv[argc++] = "mount"; + argv[argc++] = "imagex"; 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"; - } + + /* + * 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; @@ -1767,7 +1993,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;