Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/hlist

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc fs/dcache.c
index b997aad9dbe660b5dac946c3e55aa881f1c8a085,9836d0435daf3add9a9c475ce490efe226e6e352..4317d965af1ad78b960eb3ae3e266491ec93a442
--- 1/fs/dcache.c
--- 2/fs/dcache.c
+++ b/fs/dcache.c
@@@ -1055,8 -1042,8 +1045,8 @@@ int d_validate(struct dentry *dentry, s
                /* read_barrier_depends() not required for d_hash list
                 * as it is parsed under dcache_lock
                 */
-               if (dentry == list_entry(lhp, struct dentry, d_hash)) {
+               if (dentry == hlist_entry(lhp, struct dentry, d_hash)) {
 -                      dget(dentry);
 +                      __dget_locked(dentry);
                        spin_unlock(&dcache_lock);
                        return 1;
                }

diff --cc fs/inode.c
Simple merge

diff --cc include/linux/dcache.h
Simple merge

diff --cc include/linux/fs.h
Simple merge