[PATCH] FAT: use hlist_head for fat_inode_hashtable

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index a3a6e08f36a4bc4dc8fee15cf4fa72710109c07b..ba3b68ebea680d677b88b597a94f5dda9b776a79 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -61,15 +61,14 @@ static void fat_write_inode(struct inode *inode, int wait);
 #define FAT_HASH_BITS  8
 #define FAT_HASH_SIZE  (1UL << FAT_HASH_BITS)
 #define FAT_HASH_MASK  (FAT_HASH_SIZE-1)
-static struct list_head fat_inode_hashtable[FAT_HASH_SIZE];
+static struct hlist_head fat_inode_hashtable[FAT_HASH_SIZE];
 static spinlock_t fat_inode_lock = SPIN_LOCK_UNLOCKED;
 
 void fat_hash_init(void)
 {
        int i;
-       for(i = 0; i < FAT_HASH_SIZE; i++) {
-               INIT_LIST_HEAD(&fat_inode_hashtable[i]);
-       }
+       for (i = 0; i < FAT_HASH_SIZE; i++)
+               INIT_HLIST_HEAD(&fat_inode_hashtable[i]);
 }
 
 static inline unsigned long fat_hash(struct super_block *sb, loff_t i_pos)
@@ -83,7 +82,7 @@ void fat_attach(struct inode *inode, loff_t i_pos)
 {
        spin_lock(&fat_inode_lock);
        MSDOS_I(inode)->i_pos = i_pos;
-       list_add(&MSDOS_I(inode)->i_fat_hash,
+       hlist_add_head(&MSDOS_I(inode)->i_fat_hash,
                fat_inode_hashtable + fat_hash(inode->i_sb, i_pos));
        spin_unlock(&fat_inode_lock);
 }
@@ -92,20 +91,19 @@ void fat_detach(struct inode *inode)
 {
        spin_lock(&fat_inode_lock);
        MSDOS_I(inode)->i_pos = 0;
-       list_del_init(&MSDOS_I(inode)->i_fat_hash);
+       hlist_del_init(&MSDOS_I(inode)->i_fat_hash);
        spin_unlock(&fat_inode_lock);
 }
 
 struct inode *fat_iget(struct super_block *sb, loff_t i_pos)
 {
-       struct list_head *p = fat_inode_hashtable + fat_hash(sb, i_pos);
-       struct list_head *walk;
+       struct hlist_head *head = fat_inode_hashtable + fat_hash(sb, i_pos);
+       struct hlist_node *_p;
        struct msdos_inode_info *i;
        struct inode *inode = NULL;
 
        spin_lock(&fat_inode_lock);
-       list_for_each(walk, p) {
-               i = list_entry(walk, struct msdos_inode_info, i_fat_hash);
+       hlist_for_each_entry(i, _p, head, i_fat_hash) {
                if (i->vfs_inode.i_sb != sb)
                        continue;
                if (i->i_pos != i_pos)
@@ -162,7 +160,7 @@ static void fat_clear_inode(struct inode *inode)
        lock_kernel();
        spin_lock(&fat_inode_lock);
        fat_cache_inval_inode(inode);
-       list_del_init(&MSDOS_I(inode)->i_fat_hash);
+       hlist_del_init(&MSDOS_I(inode)->i_fat_hash);
        spin_unlock(&fat_inode_lock);
        unlock_kernel();
 }
@@ -738,7 +736,7 @@ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
 
        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
            SLAB_CTOR_CONSTRUCTOR) {
-               INIT_LIST_HEAD(&ei->i_fat_hash);
+               INIT_HLIST_NODE(&ei->i_fat_hash);
                inode_init_once(&ei->vfs_inode);
        }
 }

diff --git a/include/linux/msdos_fs_i.h b/include/linux/msdos_fs_i.h
index f2383d22a83121020d040da81705561ec3efd23c..13717b437be01addc0af8154d6ccd6c64246d508 100644 (file)
--- a/include/linux/msdos_fs_i.h
+++ b/include/linux/msdos_fs_i.h
@@ -18,7 +18,7 @@ struct msdos_inode_info {
        int i_attrs;    /* unused attribute bits */
        int i_ctime_ms; /* unused change time in milliseconds */
        loff_t i_pos;   /* on-disk position of directory entry or 0 */
-       struct list_head i_fat_hash;    /* hash by i_location */
+       struct hlist_node i_fat_hash;   /* hash by i_location */
        struct inode vfs_inode;
 };