Merge /spare/repo/linux-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 50be290d24d2..ab04b4f9b0db 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -88,8 +88,9 @@ struct dentry {
                                          * negative */
         /*
          * The next three fields are touched by __d_lookup.  Place them here
-         * so they all fit in a 16-byte range, with 16-byte alignment.
+         * so they all fit in a cache line.
          */
+        struct hlist_node d_hash;       /* lookup hash list */
         struct dentry *d_parent;        /* parent directory */
         struct qstr d_name;
 
@@ -103,7 +104,6 @@ struct dentry {
         void *d_fsdata;                 /* fs-specific data */
         struct rcu_head d_rcu;
         struct dcookie_struct *d_cookie; /* cookie, if any */
-        struct hlist_node d_hash;       /* lookup hash list */  
         int d_mounted;
         unsigned char d_iname[DNAME_INLINE_LEN_MIN];    /* small names */
 };