Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[~andy/linux] / fs / gfs2 / main.c

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index c2b34cd2abe0e81f7be6eab08189817507d9f307..29e1ace7953d619b707e461e0da8a1ac61f6d167 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -41,6 +41,7 @@ static void gfs2_init_inode_once(void *foo)
        init_rwsem(&ip->i_rw_mutex);
        INIT_LIST_HEAD(&ip->i_trunc_list);
        ip->i_alloc = NULL;
+       ip->i_hash_cache = NULL;
 }
 
 static void gfs2_init_glock_once(void *foo)