return __dentry_total_length(dentry, dentry->length);
}
-/* Transfers file attributes from a `stat' buffer to a struct dentry. */
-void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry)
+/* Transfers file attributes from a `stat' buffer to an inode. */
+void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
{
- struct inode *inode = dentry->inode;
if (S_ISLNK(stbuf->st_mode)) {
inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
inode->attributes = FILE_ATTRIBUTE_NORMAL;
}
if (sizeof(ino_t) >= 8)
- dentry->link_group_id = (u64)stbuf->st_ino;
+ inode->ino = (u64)stbuf->st_ino;
else
- dentry->link_group_id = (u64)stbuf->st_ino |
+ inode->ino = (u64)stbuf->st_ino |
((u64)stbuf->st_dev << (sizeof(ino_t) * 8));
/* Set timestamps */
inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
/* Returns the alternate data stream entry belonging to @inode that has the
* stream name @stream_name. */
struct ads_entry *inode_get_ads_entry(struct inode *inode,
- const char *stream_name)
+ const char *stream_name,
+ u16 *idx_ret)
{
size_t stream_name_len;
if (!stream_name)
do {
if (ads_entry_has_name(inode->ads_entries[i],
stream_name, stream_name_len))
+ {
+ if (idx_ret)
+ *idx_ret = i;
return inode->ads_entries[i];
+ }
} while (++i != inode->num_ads);
}
return NULL;
struct ads_entry *ads_entry = CALLOC(1, sizeof(struct ads_entry));
if (!ads_entry)
return NULL;
- INIT_LIST_HEAD(&ads_entry->lte_group_list.list);
- ads_entry->lte_group_list.type = STREAM_TYPE_ADS;
if (name && *name) {
if (change_ads_name(ads_entry, name)) {
FREE(ads_entry);
struct ads_entry **ads_entries;
struct ads_entry *new_entry;
- if (inode->num_ads == 0xffff) {
+ if (inode->num_ads >= 0xfffe) {
ERROR("Too many alternate data streams in one inode!");
return NULL;
}
inode->ads_entries = ads_entries;
new_entry = new_ads_entry(stream_name);
- if (new_entry)
+ if (!new_entry)
return NULL;
inode->num_ads = num_ads;
ads_entries[num_ads - 1] = new_entry;
+#ifdef WITH_FUSE
+ new_entry->stream_id = inode->next_stream_id++;
+#endif
return new_entry;
}
if (ret != 0)
return ret;
- child = root->children;
+ child = root->inode->children;
if (!child)
return 0;
if (ret != 0)
return ret;
child = child->next;
- } while (child != root->children);
+ } while (child != root->inode->children);
return 0;
}
struct dentry *child;
struct dentry *next;
- child = root->children;
+ child = root->inode->children;
if (child) {
do {
next = child->next;
if (ret != 0)
return ret;
child = next;
- } while (child != root->children);
+ } while (child != root->inode->children);
}
return visitor(root, arg);
}
{
struct dentry *child;
- child = dentry->children;
+ child = dentry->inode->children;
dentry->subdir_offset = *subdir_offset_p;
if (child) {
do {
*subdir_offset_p += dentry_correct_total_length(child);
child = child->next;
- } while (child != dentry->children);
+ } while (child != dentry->inode->children);
/* End-of-directory dentry on disk. */
*subdir_offset_p += 8;
do {
calculate_subdir_offsets(child, subdir_offset_p);
child = child->next;
- } while (child != dentry->children);
+ } while (child != dentry->inode->children);
} else {
/* On disk, childless directories have a valid subdir_offset
* that points to an 8-byte end-of-directory dentry. Regular
struct dentry *child;
size_t name_len;
- child = dentry->children;
+ child = dentry->inode->children;
if (child) {
name_len = strlen(name);
do {
if (dentry_has_name(child, name, name_len))
return child;
child = child->next;
- } while (child != dentry->children);
+ } while (child != dentry->inode->children);
}
return NULL;
}
if (*path == '\0')
return cur_dir;
- child = cur_dir->children;
+ child = cur_dir->inode->children;
if (child) {
new_path = path_next_part(path, &base_len);
do {
if (dentry_has_name(child, path, base_len))
return get_dentry_relative_path(child, new_path);
child = child->next;
- } while (child != cur_dir->children);
+ } while (child != cur_dir->inode->children);
}
return NULL;
}
return get_dentry_relative_path(root, path);
}
+struct inode *wim_pathname_to_inode(WIMStruct *w, const char *path)
+{
+ struct dentry *dentry;
+ dentry = get_dentry(w, path);
+ if (!dentry)
+ return NULL;
+ else
+ return dentry->inode;
+}
+
/* Returns the dentry that corresponds to the parent directory of @path, or NULL
* if the dentry is not found. */
struct dentry *get_parent_dentry(WIMStruct *w, const char *path)
file_attr_flags[i].name);
printf("Security ID = %d\n", inode->security_id);
printf("Subdir offset = %"PRIu64"\n", dentry->subdir_offset);
-#if 0
- printf("Unused1 = 0x%"PRIu64"\n", dentry->unused1);
- printf("Unused2 = %"PRIu64"\n", dentry->unused2);
-#endif
-#if 0
- printf("Creation Time = 0x%"PRIx64"\n");
- printf("Last Access Time = 0x%"PRIx64"\n");
- printf("Last Write Time = 0x%"PRIx64"\n");
-#endif
/* Translate the timestamps into something readable */
time = wim_timestamp_to_unix(inode->creation_time);
printf("Last Write Time = %s UTC\n", p);
printf("Reparse Tag = 0x%"PRIx32"\n", inode->reparse_tag);
- printf("Hard Link Group = 0x%"PRIx64"\n", dentry->link_group_id);
+ printf("Hard Link Group = 0x%"PRIx64"\n", inode->ino);
+ printf("Hard Link Group Size = %"PRIu32"\n", inode->link_count);
printf("Number of Alternate Data Streams = %hu\n", inode->num_ads);
printf("Filename = \"");
print_string(dentry->file_name, dentry->file_name_len);
dentry->refcnt = 1;
}
-struct inode *new_inode()
+struct inode *new_timeless_inode()
{
struct inode *inode = CALLOC(1, sizeof(struct inode));
- u64 now = get_wim_timestamp();
if (!inode)
return NULL;
inode->security_id = -1;
inode->link_count = 1;
+ INIT_LIST_HEAD(&inode->dentry_list);
+ return inode;
+}
+
+struct inode *new_inode()
+{
+ struct inode *inode = new_timeless_inode();
+ if (!inode)
+ return NULL;
+ u64 now = get_wim_timestamp();
inode->creation_time = now;
inode->last_access_time = now;
inode->last_write_time = now;
- INIT_LIST_HEAD(&inode->dentry_list);
return inode;
}
return NULL;
}
-struct dentry *new_dentry_with_inode(const char *name)
+
+static struct dentry *__new_dentry_with_inode(const char *name, bool timeless)
{
struct dentry *dentry;
dentry = new_dentry(name);
if (dentry) {
- dentry->inode = new_inode();
+ if (timeless)
+ dentry->inode = new_timeless_inode();
+ else
+ dentry->inode = new_inode();
if (dentry->inode) {
- list_add(&dentry->inode_dentry_list,
- &dentry->inode->dentry_list);
+ inode_add_dentry(dentry, dentry->inode);
} else {
free_dentry(dentry);
dentry = NULL;
return dentry;
}
-static void free_ads_entry(struct ads_entry *entry)
+struct dentry *new_dentry_with_timeless_inode(const char *name)
{
- if (entry) {
- FREE(entry->stream_name);
- FREE(entry->stream_name_utf8);
- FREE(entry);
- }
+ return __new_dentry_with_inode(name, true);
}
+struct dentry *new_dentry_with_inode(const char *name)
+{
+ return __new_dentry_with_inode(name, false);
+}
-#ifdef WITH_FUSE
-/* Remove an alternate data stream from a dentry.
- *
- * The corresponding lookup table entry for the stream is NOT changed.
- *
- * @dentry: The dentry
- * @ads_entry: The alternate data stream entry (it MUST be one of the
- * ads_entry's in the array dentry->ads_entries).
- */
-void dentry_remove_ads(struct dentry *dentry, struct ads_entry *ads_entry)
+void free_ads_entry(struct ads_entry *entry)
{
- u16 idx;
- u16 following;
-
- wimlib_assert(dentry->num_ads);
- idx = ads_entry - dentry->ads_entries;
- wimlib_assert(idx < dentry->num_ads);
- following = dentry->num_ads - idx - 1;
-
- destroy_ads_entry(ads_entry);
- memcpy(ads_entry, ads_entry + 1, following * sizeof(struct ads_entry));
-
- /* We moved the ADS entries. Adjust the stream lists. */
- for (u16 i = 0; i < following; i++) {
- struct list_head *cur = &ads_entry[i].lte_group_list.list;
- struct list_head *prev = cur->prev;
- struct list_head *next;
- if ((u8*)prev >= (u8*)(ads_entry + 1)
- && (u8*)prev < (u8*)(ads_entry + following + 1)) {
- cur->prev = (struct list_head*)((u8*)prev - sizeof(struct ads_entry));
- } else {
- prev->next = cur;
- }
- next = cur->next;
- if ((u8*)next >= (u8*)(ads_entry + 1)
- && (u8*)next < (u8*)(ads_entry + following + 1)) {
- cur->next = (struct list_head*)((u8*)next - sizeof(struct ads_entry));
- } else {
- next->prev = cur;
- }
+ if (entry) {
+ FREE(entry->stream_name);
+ FREE(entry->stream_name_utf8);
+ FREE(entry);
}
- dentry->num_ads--;
}
-#endif
-static void inode_free_ads_entries(struct inode *inode)
+void inode_free_ads_entries(struct inode *inode)
{
if (inode->ads_entries) {
for (u16 i = 0; i < inode->num_ads; i++)
}
}
+/* Frees an inode. */
void free_inode(struct inode *inode)
{
- wimlib_assert(inode);
- inode_free_ads_entries(inode);
- FREE(inode);
+ if (inode) {
+ inode_free_ads_entries(inode);
+ #ifdef WITH_FUSE
+ wimlib_assert(inode->num_opened_fds == 0);
+ FREE(inode->fds);
+ #endif
+ FREE(inode);
+ }
}
-void put_inode(struct inode *inode)
+/* Decrements link count on an inode and frees it if the link count reaches 0.
+ * */
+struct inode *put_inode(struct inode *inode)
{
if (inode) {
wimlib_assert(inode->link_count);
- if (--inode->link_count)
- free_inode(inode);
+ if (--inode->link_count == 0) {
+ #ifdef WITH_FUSE
+ if (inode->num_opened_fds == 0)
+ #endif
+ {
+ free_inode(inode);
+ inode = NULL;
+ }
+ }
}
+ return inode;
}
-/* Frees a WIM dentry. */
-void free_dentry(struct dentry *dentry)
+/* Frees a WIM dentry.
+ *
+ * The inode is freed only if its link count is decremented to 0.
+ */
+struct inode *free_dentry(struct dentry *dentry)
{
wimlib_assert(dentry);
+ struct inode *inode;
+
FREE(dentry->file_name);
FREE(dentry->file_name_utf8);
FREE(dentry->short_name);
FREE(dentry->full_path_utf8);
- put_inode(dentry->inode);
+ inode = put_inode(dentry->inode);
FREE(dentry);
+ return inode;
+}
+
+void put_dentry(struct dentry *dentry)
+{
+ wimlib_assert(dentry);
+ wimlib_assert(dentry->refcnt);
+
+ if (--dentry->refcnt == 0)
+ free_dentry(dentry);
}
+#if 0
/* Partically clones a dentry.
*
* Beware:
new->short_name_len = 0;
return new;
}
+#endif
/*
* This function is passed as an argument to for_dentry_in_tree_depth() in order
unsigned i;
if (lookup_table) {
+ wimlib_assert(inode->link_count);
for (i = 0; i <= inode->num_ads; i++) {
lte = inode_stream_lte(inode, i, lookup_table);
lte_decrement_refcnt(lte, lookup_table);
{
wimlib_assert(dentry_is_directory(parent));
dentry->parent = parent;
- if (parent->children) {
+ if (parent->inode->children) {
/* Not an only child; link to siblings. */
- dentry->next = parent->children;
- dentry->prev = parent->children->prev;
+ dentry->next = parent->inode->children;
+ dentry->prev = parent->inode->children->prev;
dentry->next->prev = dentry;
dentry->prev->next = dentry;
} else {
/* Only child; link to parent. */
- parent->children = dentry;
+ parent->inode->children = dentry;
dentry->next = dentry;
dentry->prev = dentry;
}
}
-/* Unlink a dentry from the directory tree.
+/*
+ * Unlink a dentry from the directory tree.
*
- * Note: This merely removes it from the in-memory tree structure. See
- * remove_dentry() in mount.c for a function implemented on top of this one that
- * frees the dentry and implements reference counting for the lookup table
- * entries. */
+ * Note: This merely removes it from the in-memory tree structure.
+ */
void unlink_dentry(struct dentry *dentry)
{
if (dentry_is_root(dentry))
return;
if (dentry_is_only_child(dentry)) {
- dentry->parent->children = NULL;
+ dentry->parent->inode->children = NULL;
} else {
if (dentry_is_first_sibling(dentry))
- dentry->parent->children = dentry->next;
+ dentry->parent->inode->children = dentry->next;
dentry->next->prev = dentry->prev;
dentry->prev->next = dentry->next;
}
stats.file_count = file_count_ret;
stats.total_bytes = total_bytes_ret;
stats.hard_link_bytes = hard_link_bytes_ret;
- for_lookup_table_entry(table, zero_out_refcnts, NULL);
+ for_lookup_table_entry(table, lte_zero_out_refcnt, NULL);
for_dentry_in_tree(root, calculate_dentry_statistics, &stats);
}
ads_entries[i] = cur_entry;
+ #ifdef WITH_FUSE
+ ads_entries[i]->stream_id = i + 1;
+ #endif
+
/* Read the base stream entry, excluding the stream name. */
if (remaining_size < WIM_ADS_ENTRY_DISK_SIZE) {
ERROR("Stream entries go past end of metadata resource");
remaining_size -= total_length;
}
inode->ads_entries = ads_entries;
+#ifdef WITH_FUSE
+ inode->next_stream_id = inode->num_ads + 1;
+#endif
return 0;
out_free_ads_entries:
for (u16 i = 0; i < num_ads; i++)
return WIMLIB_ERR_INVALID_DENTRY;
}
- inode = new_inode();
+ inode = new_timeless_inode();
if (!inode)
return WIMLIB_ERR_NOMEM;
p += 4;
} else {
p = get_u32(p, &inode->reparse_tag);
- p = get_u64(p, &dentry->link_group_id);
+ p = get_u64(p, &inode->ino);
}
/* By the way, the reparse_reserved field does not actually exist (at
/* We've read all the data for this dentry. Set the names and their
* lengths, and we've done. */
+ dentry->inode = inode;
dentry->file_name = file_name;
dentry->file_name_utf8 = file_name_utf8;
dentry->short_name = short_name;
return ret;
}
-/* Run some miscellaneous verifications on a WIM dentry */
-int verify_dentry(struct dentry *dentry, void *wim)
+int verify_inode(struct inode *inode, const WIMStruct *w)
{
- const WIMStruct *w = wim;
const struct lookup_table *table = w->lookup_table;
const struct wim_security_data *sd = wim_const_security_data(w);
- const struct inode *inode = dentry->inode;
+ const struct dentry *first_dentry = inode_first_dentry(inode);
int ret = WIMLIB_ERR_INVALID_DENTRY;
/* Check the security ID */
if (inode->security_id < -1) {
ERROR("Dentry `%s' has an invalid security ID (%d)",
- dentry->full_path_utf8, inode->security_id);
+ first_dentry->full_path_utf8, inode->security_id);
goto out;
}
if (inode->security_id >= sd->num_entries) {
ERROR("Dentry `%s' has an invalid security ID (%d) "
"(there are only %u entries in the security table)",
- dentry->full_path_utf8, inode->security_id,
+ first_dentry->full_path_utf8, inode->security_id,
sd->num_entries);
goto out;
}
lte = __lookup_resource(table, hash);
if (!lte && !is_zero_hash(hash)) {
ERROR("Could not find lookup table entry for stream "
- "%u of dentry `%s'", i, dentry->full_path_utf8);
+ "%u of dentry `%s'", i, first_dentry->full_path_utf8);
goto out;
}
+ if (lte && (lte->real_refcnt += inode->link_count) > lte->refcnt)
+ {
+ #ifdef ENABLE_ERROR_MESSAGES
+ WARNING("The following lookup table entry "
+ "has a reference count of %u, but",
+ lte->refcnt);
+ WARNING("We found %zu references to it",
+ lte->real_refcnt);
+ WARNING("(One dentry referencing it is at `%s')",
+ first_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.
+ * (Unfortunately, even after doing this, the
+ * reference count could be too low if it's also
+ * referenced in other WIM images) */
+
+ #if 1
+ lte->refcnt = lte->real_refcnt;
+ WARNING("Fixing reference count");
+ #else
+ goto out;
+ #endif
+ }
}
}
}
if (num_unnamed_streams > 1) {
ERROR("Dentry `%s' has multiple (%u) un-named streams",
- dentry->full_path_utf8, num_unnamed_streams);
+ first_dentry->full_path_utf8, num_unnamed_streams);
goto out;
}
+ inode->verified = true;
+ ret = 0;
+out:
+ return ret;
+}
+
+
+/* Run some miscellaneous verifications on a WIM dentry */
+int verify_dentry(struct dentry *dentry, void *wim)
+{
+ const WIMStruct *w = wim;
+ const struct inode *inode = dentry->inode;
+ int ret = WIMLIB_ERR_INVALID_DENTRY;
+
+ if (!dentry->inode->verified) {
+ ret = verify_inode(dentry->inode, w);
+ if (ret != 0)
+ goto out;
+ }
/* Cannot have a short name but no long name */
if (dentry->short_name_len && !dentry->file_name_len) {
} else {
u64 link_group_id;
p = put_u32(p, 0);
- if (dentry->inode->link_count == 1)
+ if (inode->link_count == 1)
link_group_id = 0;
else
- link_group_id = dentry->inode->ino;
+ link_group_id = inode->ino;
p = put_u64(p, link_group_id);
}
p = put_u16(p, inode->num_ads);
* recursively writing the directory trees rooted at each of the child
* dentries, since the on-disk dentries for a dentry's children are
* always located at consecutive positions in the metadata resource! */
- child = parent->children;
+ child = parent->inode->children;
if (child) {
do {
p = write_dentry(child, p);
child = child->next;
- } while (child != parent->children);
+ } while (child != parent->inode->children);
}
/* write end of directory entry */
do {
p = write_dentry_tree_recursive(child, p);
child = child->next;
- } while (child != parent->children);
+ } while (child != parent->inode->children);
}
return p;
}
child->parent = dentry;
prev_child = child;
+ inode_add_dentry(child, child->inode);
/* If there are children of this child, call this procedure
* recursively. */
prev_child->next = first_child;
first_child->prev = prev_child;
}
- dentry->children = first_child;
+ dentry->inode->children = first_child;
return ret;
}
git://wimlib.net / wimlib / blobdiff