X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount.c;h=6d21e84127c16d5086ef7305ef512eec5023dfd3;hb=0dd190af48ac572f9e33ff9436ec8900fa6281a3;hp=fd386a8e8c5277a9c725c796d26f9dab49155a07;hpb=5e770a99c374e24bf2a174e0fb675aaa57df0af4;p=wimlib diff --git a/src/mount.c b/src/mount.c index fd386a8e..6d21e841 100644 --- a/src/mount.c +++ b/src/mount.c @@ -177,47 +177,43 @@ 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++; - } -} -/* 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 (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; - 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); + 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. */ + if ((lte = dentry_lte(dentry))) { + if (lte->staging_file_name) { + struct stat native_stat; + if (stat(lte->staging_file_name, &native_stat) != 0) + return -errno; + stbuf->st_size = native_stat.st_size; + } else { + stbuf->st_size = lte->resource_entry.original_size; + } } 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); + 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_blocks = (stbuf->st_size + 511) / 512; + return 0; } /* Creates a new staging file and returns its file descriptor opened for @@ -275,6 +271,94 @@ 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->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->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; + } + } + 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) +{ + 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; + do { + struct dentry *d; + d = container_of(pos, struct dentry, link_group_list); + lte_transfer_dentry(new_lte, d); + + pos = pos->next; + } while (pos != &dentry->link_group_list); + } else { + struct ads_entry *ads_entry; + ads_entry = &dentry->ads_entries[stream_idx - 1]; + lte_transfer_ads_entry(new_lte, ads_entry); + } +} + /* * Extract a WIM resource to the staging directory. * @@ -285,8 +369,13 @@ static int create_staging_file(char **name_ret, int open_flags) * - 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. + * + * *lte is permitted to be NULL, in which case there is no old lookup table + * entry. */ static int extract_resource_to_staging_dir(struct dentry *dentry, + unsigned stream_idx, struct lookup_table_entry **lte, off_t size) { @@ -324,7 +413,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 " @@ -343,48 +432,14 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, * streams themselves are not hardlinked. */ 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++; - } - } - 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); - ret = -ENOMEM; - goto out_delete_staging_file; - } - for (u16 i = 0, j = 0; ; 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; - if (++j == num_transferred_fds) - break; - } - } + lte_transfer_stream_entries(new_lte, dentry, stream_idx); old_lte->refcnt -= link_group_size; - old_lte->num_opened_fds -= num_transferred_fds; - new_lte->num_opened_fds = num_transferred_fds; - new_lte->num_allocated_fds = num_transferred_fds; } } else { /* No old_lte was supplied, so the resource had no lookup table @@ -394,6 +449,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry, 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; @@ -659,46 +715,59 @@ static int close_lte_fds(struct lookup_table_entry *lte) return 0; } - -/* 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) +static void lte_list_change_lte_ptr(struct lookup_table_entry *lte, + struct lookup_table_entry *newptr) { - 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 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); + + dentry->lte = newptr; } - if (i == dentry->num_ads) - break; - hash = dentry->ads_entries[i].hash; - i++; } +} + + +static int calculate_sha1sum_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]; + + 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); + + if (duplicate_lte) { + /* Merge duplicate lookup table entries */ + + lte_list_change_lte_ptr(lte, duplicate_lte); + duplicate_lte->refcnt += lte->refcnt; + list_splice(&duplicate_lte->lte_group_list, + <e->lte_group_list); + + free_lookup_table_entry(lte); + } else { + lookup_table_insert(table, lte); + } + return 0; } @@ -706,7 +775,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."); @@ -719,8 +788,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 = calculate_sha1sum_of_staging_file(lte, w->lookup_table); + if (ret != 0) + return ret; + } if (ret != 0) return ret; @@ -821,7 +893,7 @@ static int wimfs_fgetattr(const char *path, struct stat *stbuf, struct fuse_file_info *fi) { struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh; - return dentry_to_stbuf(fd->dentry, stbuf, w->lookup_table); + return dentry_to_stbuf(fd->dentry, stbuf); } static int wimfs_ftruncate(const char *path, off_t size, @@ -843,7 +915,7 @@ static int wimfs_getattr(const char *path, struct stat *stbuf) struct dentry *dentry = get_dentry(w, path); if (!dentry) return -ENOENT; - return dentry_to_stbuf(dentry, stbuf, w->lookup_table); + return dentry_to_stbuf(dentry, stbuf); } static int wimfs_getxattr(const char *path, const char *name, char *value, @@ -881,10 +953,27 @@ 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); - link_dentry(from_dentry, from_dentry_parent); - dentry_increment_lookup_table_refcnts(from_dentry, w->lookup_table); + + /* 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->link_group_master_status = GROUP_SLAVE; + + link_dentry(from_dentry, from_dentry_parent); return 0; } @@ -928,6 +1017,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; @@ -943,6 +1033,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); @@ -958,6 +1050,7 @@ 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++; link_dentry(dentry, parent); } @@ -991,10 +1084,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; - link_group_set_stream_hash(dentry, stream_idx, lte->hash); } ret = alloc_wimlib_fd(lte, &fd); @@ -1011,11 +1104,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; - link_group_set_stream_hash(dentry, stream_idx, lte->hash); } if (lte->staging_file_name) { fd->staging_fd = open(lte->staging_file_name, fi->flags); @@ -1267,6 +1359,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; dentry_parent = get_parent_dentry(w, from); if (!dentry_parent) @@ -1285,9 +1378,14 @@ static int wimfs_symlink(const char *to, const char *from) dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - 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; + 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; + link_dentry(dentry, dentry_parent); return 0; out_free_dentry: @@ -1302,9 +1400,10 @@ static int wimfs_truncate(const char *path, off_t size) struct dentry *dentry; struct lookup_table_entry *lte; int ret; + unsigned stream_idx; ret = lookup_resource(w, path, get_lookup_flags(), &dentry, - <e, NULL); + <e, &stream_idx); if (ret != 0) return ret; @@ -1320,7 +1419,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; @@ -1350,9 +1450,8 @@ static int wimfs_unlink(const char *path) struct ads_entry *ads_entry; ads_entry = &dentry->ads_entries[stream_idx - 1]; - - lookup_table_decrement_refcnt(w->lookup_table, ads_entry->hash); - + lte_decrement_refcnt(lte, w->lookup_table); + 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 @@ -1387,6 +1486,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); @@ -1459,6 +1559,8 @@ 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), w->lookup_table); + if (flags & WIMLIB_MOUNT_FLAG_READWRITE) wim_get_current_image_metadata(wim)->modified = true;