From 6460a27c606eed49e900c73a3316ac12d77a3a2e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 09:52:13 -0500 Subject: [PATCH] Rename i_hlist => i_hlist_node --- include/wimlib/inode.h | 2 +- include/wimlib/inode_table.h | 2 +- include/wimlib/metadata.h | 4 ++-- src/inode.c | 4 ++-- src/inode_fixup.c | 8 ++++---- src/inode_table.c | 16 ++++++++-------- src/mount_image.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h index 01254c82..fc8ddc27 100644 --- a/include/wimlib/inode.h +++ b/include/wimlib/inode.h @@ -124,7 +124,7 @@ struct wim_inode { /* Field to place this inode into a list. While reading a WIM image or * adding files to a WIM image this is owned by the inode table; * otherwise this links the inodes for the WIM image. */ - struct hlist_node i_hlist; + struct hlist_node i_hlist_node; /* Number of dentries that are aliases for this inode. */ u32 i_nlink : 30; diff --git a/include/wimlib/inode_table.h b/include/wimlib/inode_table.h index 01f371e0..a9322d06 100644 --- a/include/wimlib/inode_table.h +++ b/include/wimlib/inode_table.h @@ -10,7 +10,7 @@ struct wim_dentry; * the case of reading a WIM image), or both an inode number and a device number * (in the case of adding files to a WIM image). Also contains an extra list to * hold inodes for which no additional hard link detection is desired. In both - * cases the inodes are linked by i_hlist. */ + * cases the inodes are linked by i_hlist_node. */ struct wim_inode_table { struct hlist_head *array; size_t num_entries; diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h index 00647a1c..10cd414c 100644 --- a/include/wimlib/metadata.h +++ b/include/wimlib/metadata.h @@ -63,11 +63,11 @@ wim_get_current_security_data(WIMStruct *wim) /* Iterate over each inode in a WIM image */ #define image_for_each_inode(inode, imd) \ - hlist_for_each_entry(inode, &(imd)->inode_list, i_hlist) + hlist_for_each_entry(inode, &(imd)->inode_list, i_hlist_node) /* Iterate over each inode in a WIM image (safe against inode removal) */ #define image_for_each_inode_safe(inode, tmp, imd) \ - hlist_for_each_entry_safe(inode, tmp, &(imd)->inode_list, i_hlist) + hlist_for_each_entry_safe(inode, tmp, &(imd)->inode_list, i_hlist_node) /* Iterate over each blob in a WIM image that has not yet been hashed */ #define image_for_each_unhashed_blob(blob, imd) \ diff --git a/src/inode.c b/src/inode.c index 217d9d04..03db2fb1 100644 --- a/src/inode.c +++ b/src/inode.c @@ -85,8 +85,8 @@ free_inode(struct wim_inode *inode) FREE(inode->i_streams); if (inode->i_extra) FREE(inode->i_extra); - if (!hlist_unhashed(&inode->i_hlist)) - hlist_del(&inode->i_hlist); + if (!hlist_unhashed(&inode->i_hlist_node)) + hlist_del(&inode->i_hlist_node); FREE(inode); } diff --git a/src/inode_fixup.c b/src/inode_fixup.c index 2ece5308..03df7c79 100644 --- a/src/inode_fixup.c +++ b/src/inode_fixup.c @@ -67,13 +67,13 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) struct wim_inode *inode; if (d_inode->i_ino == 0) { - hlist_add_head(&d_inode->i_hlist, &table->extra_inodes); + hlist_add_head(&d_inode->i_hlist_node, &table->extra_inodes); return 0; } /* Try adding this dentry to an existing inode. */ pos = d_inode->i_ino % table->capacity; - hlist_for_each_entry(inode, &table->array[pos], i_hlist) { + hlist_for_each_entry(inode, &table->array[pos], i_hlist_node) { if (inode->i_ino != d_inode->i_ino) { continue; } @@ -107,7 +107,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) } /* Keep this dentry's inode. */ - hlist_add_head(&d_inode->i_hlist, &table->array[pos]); + hlist_add_head(&d_inode->i_hlist_node, &table->array[pos]); return 0; } @@ -139,7 +139,7 @@ reassign_inode_numbers(struct hlist_head *inode_list) struct wim_inode *inode; u64 cur_ino = 1; - hlist_for_each_entry(inode, inode_list, i_hlist) + hlist_for_each_entry(inode, inode_list, i_hlist_node) inode->i_ino = cur_ino++; } diff --git a/src/inode_table.c b/src/inode_table.c index 86e3155f..1eac9466 100644 --- a/src/inode_table.c +++ b/src/inode_table.c @@ -99,14 +99,14 @@ inode_table_new_dentry(struct wim_inode_table *table, const tchar *name, ret = new_dentry_with_new_inode(name, false, &dentry); if (ret) return ret; - hlist_add_head(&dentry->d_inode->i_hlist, &table->extra_inodes); + hlist_add_head(&dentry->d_inode->i_hlist_node, &table->extra_inodes); } else { size_t pos; /* File that can be hardlinked--- search the table for an * existing inode matching the inode number and device. */ pos = hash_u64(hash_u64(ino) + hash_u64(devno)) % table->capacity; - hlist_for_each_entry(inode, &table->array[pos], i_hlist) { + hlist_for_each_entry(inode, &table->array[pos], i_hlist_node) { if (inode->i_ino == ino && inode->i_devno == devno) { /* Found; use the existing inode. */ return new_dentry_with_existing_inode(name, inode, @@ -121,7 +121,7 @@ inode_table_new_dentry(struct wim_inode_table *table, const tchar *name, inode = dentry->d_inode; inode->i_ino = ino; inode->i_devno = devno; - hlist_add_head(&inode->i_hlist, &table->array[pos]); + hlist_add_head(&inode->i_hlist_node, &table->array[pos]); table->num_entries++; } *dentry_ret = dentry; @@ -143,23 +143,23 @@ inode_table_prepare_inode_list(struct wim_inode_table *table, u64 cur_ino = 1; /* Re-assign inode numbers in the existing list to avoid duplicates. */ - hlist_for_each_entry(inode, head, i_hlist) + hlist_for_each_entry(inode, head, i_hlist_node) inode->i_ino = cur_ino++; /* Assign inode numbers to the new inodes and move them to the image's * inode list. */ for (size_t i = 0; i < table->capacity; i++) { - hlist_for_each_entry_safe(inode, tmp, &table->array[i], i_hlist) { + hlist_for_each_entry_safe(inode, tmp, &table->array[i], i_hlist_node) { inode->i_ino = cur_ino++; inode->i_devno = 0; - hlist_add_head(&inode->i_hlist, head); + hlist_add_head(&inode->i_hlist_node, head); } INIT_HLIST_HEAD(&table->array[i]); } - hlist_for_each_entry_safe(inode, tmp, &table->extra_inodes, i_hlist) { + hlist_for_each_entry_safe(inode, tmp, &table->extra_inodes, i_hlist_node) { inode->i_ino = cur_ino++; inode->i_devno = 0; - hlist_add_head(&inode->i_hlist, head); + hlist_add_head(&inode->i_hlist_node, head); } INIT_HLIST_HEAD(&table->extra_inodes); table->num_entries = 0; diff --git a/src/mount_image.c b/src/mount_image.c index eeacf94d..0ae5f216 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -511,7 +511,7 @@ create_file(struct fuse_context *fuse_ctx, const char *path, } } - hlist_add_head(&inode->i_hlist, + hlist_add_head(&inode->i_hlist_node, &wim_get_current_image_metadata(wimfs_ctx->wim)->inode_list); dentry_add_child(parent, dentry); -- 2.43.0