[GFS2] glock debugging and inode cache changes

This adds some extra debugging to glock.c and changes
inode.c's deallocation code to call the debugging code
at a suitable moment. I'm chasing down a particular bug
to do with deallocation at the moment and the code can
go again once the bug is fixed.

Also this includes the first part of some changes to unify
the Linux struct inode and GFS2's struct gfs2_inode. This
transformation will happen in small parts over the next short
period.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index fc4a983e3c89..92091d006a02 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -183,6 +183,8 @@ struct gfs2_glock {
         spinlock_t gl_spin;
 
         unsigned int gl_state;
+        struct task_struct *gl_owner;
+        unsigned long gl_ip;
         struct list_head gl_holders;
         struct list_head gl_waiters1;   /* HIF_MUTEX */
         struct list_head gl_waiters2;   /* HIF_DEMOTE, HIF_GREEDY */
@@ -244,6 +246,7 @@ enum {
 };
 
 struct gfs2_inode {
+        struct inode i_inode;
         struct gfs2_inum i_num;
 
         atomic_t i_count;
@@ -270,6 +273,11 @@ struct gfs2_inode {
         struct buffer_head *i_cache[GFS2_MAX_META_HEIGHT];
 };
 
+static inline struct gfs2_inode *GFS2_I(struct inode *inode)
+{
+        return container_of(inode, struct gfs2_inode, i_inode);
+}
+
 enum {
         GFF_DID_DIRECT_ALLOC    = 0,
 };