X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount.c;h=ad001ce24037deb5786465f30bd970e9ea2287d5;hp=286eadbddd8c3b99d2cc5f97341469084ac68b24;hb=db046c7191d39535dfb49e9b9bdfc0751a8c17b4;hpb=8a7aa1e0e77c5fadb2ee4d062b90532f709f7883 diff --git a/src/mount.c b/src/mount.c index 286eadbd..ad001ce2 100644 --- a/src/mount.c +++ b/src/mount.c @@ -88,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) { @@ -107,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; } @@ -140,36 +143,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++; } @@ -196,11 +206,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_first_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; @@ -209,9 +224,9 @@ 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; } @@ -232,7 +247,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; @@ -244,7 +259,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'; @@ -271,10 +286,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) { @@ -288,7 +305,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", @@ -299,7 +316,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; @@ -335,6 +352,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; @@ -344,18 +363,19 @@ 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);*/ + 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); } @@ -364,17 +384,15 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte, /* * 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 - * - Transfer stream entries from the old lte's list to the new lte's list. + * @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 * - * *lte is permitted to be NULL, in which case there is no old lookup table - * entry. + * @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, @@ -387,6 +405,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; @@ -395,8 +428,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) { @@ -426,12 +458,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); @@ -455,8 +489,9 @@ 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); 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); @@ -706,6 +741,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); @@ -741,19 +778,22 @@ static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, } -static int calculate_sha1sum_of_staging_file(struct lookup_table_entry *lte, - struct lookup_table *table) +static int update_lte_of_staging_file(struct lookup_table_entry *lte, + struct lookup_table *table) { struct lookup_table_entry *duplicate_lte; int ret; - u8 hash[WIM_HASH_SIZE]; + 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); - memcpy(lte->hash, hash, WIM_HASH_SIZE); duplicate_lte = __lookup_resource(table, hash); @@ -762,11 +802,20 @@ static int calculate_sha1sum_of_staging_file(struct lookup_table_entry *lte, lte_list_change_lte_ptr(lte, duplicate_lte); duplicate_lte->refcnt += lte->refcnt; - list_splice(&duplicate_lte->lte_group_list, - <e->lte_group_list); + 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; + } + 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); } @@ -791,7 +840,7 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity) * lookup table entries. */ DEBUG("Calculating SHA1 checksums for all new staging files."); list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) { - ret = calculate_sha1sum_of_staging_file(lte, w->lookup_table); + ret = update_lte_of_staging_file(lte, w->lookup_table); if (ret != 0) return ret; } @@ -976,7 +1025,7 @@ static int wimfs_link(const char *to, const char *from) } /* The ADS entries are owned by another dentry. */ - from_dentry->link_group_master_status = GROUP_SLAVE; + from_dentry->ads_entries_status = ADS_ENTRIES_USER; link_dentry(from_dentry, from_dentry_parent); return 0; @@ -1012,6 +1061,7 @@ 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; } @@ -1117,7 +1167,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi) 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); @@ -1159,9 +1209,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; @@ -1174,25 +1227,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) != 0) return -EIO; return size; } @@ -1201,11 +1247,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); @@ -1252,7 +1299,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; } @@ -1264,6 +1311,7 @@ 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); @@ -1303,6 +1351,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; @@ -1321,9 +1371,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); @@ -1385,15 +1439,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; - dentry->resolved = true; + wimlib_assert(dentry->resolved); link_dentry(dentry, dentry_parent); return 0; @@ -1459,8 +1515,9 @@ static int wimfs_unlink(const char *path) 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); + 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 @@ -1469,20 +1526,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; } @@ -1512,7 +1577,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, @@ -1544,6 +1608,24 @@ 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 + 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) @@ -1568,7 +1650,13 @@ WIMLIBAPI int wimlib_mount(WIMStruct *wim, int image, const char *dir, next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt); - resolve_lookup_table_entries(wim_root_dentry(wim), wim->lookup_table); + /* 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; if (flags & WIMLIB_MOUNT_FLAG_READWRITE) wim_get_current_image_metadata(wim)->modified = true; @@ -1589,23 +1677,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; @@ -1715,7 +1812,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;