/* NULL NULL
* ^ ^
- * dentry | |
- * / \ ----------- -----------
+ * dentry | |
+ * / \ ----------- -----------
* | dentry<---| struct | | struct |---> dentry
- * \ / |inode| |inode|
+ * \ / | inode | | inode |
* dentry ------------ ------------
* ^ ^
* | |
* | | dentry
* ----------- ----------- / \
* dentry<---| struct | | struct |---> dentry dentry
- * / |inode| |inode| \ /
+ * / | inode | | inode | \ /
* dentry ------------ ------------ dentry
* ^ ^
* | |
* -----------------
- * inode_table->array | idx 0 | idx 1 |
+ * inode_table->array | idx 0 | idx 1 |
* -----------------
*/
}
-static size_t inode_link_count(const struct inode *inode)
+static inline size_t inode_link_count(const struct inode *inode)
{
const struct list_head *cur;
size_t size = 0;
return size;
}
-/*
+/*
* Insert a dentry into the inode table based on its inode
* ID.
*
}
/* Fix up a "true" inode and check for inconsistencies */
-static int fix_true_inode(struct inode *inode)
+static int fix_true_inode(struct inode *inode, struct hlist_head *inode_list)
{
struct dentry *dentry;
struct dentry *ref_dentry = NULL;
ref_inode = ref_dentry->d_inode;
ref_inode->link_count = 1;
+ hlist_add_head(&ref_inode->hlist, inode_list);
list_del(&inode->dentry_list);
list_add(&ref_inode->dentry_list, &ref_dentry->inode_dentry_list);
return 0;
}
-/*
+/*
* Fixes up a nominal inode.
*
* By a nominal inode we mean a group of two or more dentries that share
static int
fix_nominal_inode(struct inode *inode, struct hlist_head *inode_list)
{
- struct dentry *dentry, *ref_dentry;
+ struct dentry *dentry;
struct hlist_node *cur, *tmp;
int ret;
size_t num_true_inodes;
if (list_empty(&dentries_with_data_streams)) {
#ifdef ENABLE_DEBUG
if (inode->link_count > 1) {
- DEBUG("Found link group of size %zu without "
+ DEBUG("Found link group of size %u without "
"any data streams:", inode->link_count);
print_inode_dentries(inode);
DEBUG("We are going to interpret it as true "
"are consistent.");
}
#endif
- hlist_add_head(&inode->hlist, inode_list);
- return fix_true_inode(inode);
+ return fix_true_inode(inode, inode_list);
}
/* One or more dentries had data streams specified. We check each of
#endif
hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, hlist) {
- hlist_add_head(&inode->hlist, inode_list);
- ret = fix_true_inode(inode);
+ ret = fix_true_inode(inode, inode_list);
if (ret != 0)
return ret;
}