Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 745dada4085ceb09eece544d6ac94e21b1c4e0f9..513aaf0dc0ab5b6bbba7d10e9567d40cf33515c7 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -264,10 +264,9 @@ struct gfs2_inode {
        struct gfs2_glock *i_gl; /* Move into i_gh? */
        struct gfs2_holder i_iopen_gh;
        struct gfs2_holder i_gh; /* for prepare/commit_write only */
-       struct gfs2_alloc i_alloc;
+       struct gfs2_alloc *i_alloc;
        u64 i_last_rg_alloc;
 
-       spinlock_t i_spin;
        struct rw_semaphore i_rw_mutex;
 };