1 files changed, 6 insertions, 3 deletions

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index e262f22f744e..013bf5f1552f 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -129,6 +129,7 @@ static void inode_go_xmote_bh(struct gfs2_glock *gl)
 
 static void inode_go_drop_th(struct gfs2_glock *gl)
 {
+        printk(KERN_INFO "drop th %p\n", gl->gl_object);
         gfs2_pte_inval(gl);
         gfs2_glock_drop_th(gl);
 }
@@ -147,6 +148,7 @@ static void inode_go_sync(struct gfs2_glock *gl, int flags)
 
         if (test_bit(GLF_DIRTY, &gl->gl_flags)) {
                 if (meta && data) {
+                        printk(KERN_INFO "sync all\n");
                         gfs2_page_sync(gl, flags | DIO_START);
                         gfs2_log_flush(gl->gl_sbd, gl);
                         gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT);
@@ -224,6 +226,7 @@ static int inode_go_lock(struct gfs2_holder *gh)
                 return 0;
 
         if (ip->i_vn != gl->gl_vn) {
+                printk(KERN_INFO "refresh inode %p\n", &ip->i_inode);
                 error = gfs2_inode_refresh(ip);
                 if (error)
                         return error;
@@ -288,7 +291,7 @@ static void inode_greedy(struct gfs2_glock *gl)
 
         spin_unlock(&ip->i_spin);
 
-        gfs2_inode_put(ip);
+        iput(&ip->i_inode);
 }
 
 /**
@@ -361,14 +364,14 @@ static void trans_go_xmote_th(struct gfs2_glock *gl, unsigned int state,
 static void trans_go_xmote_bh(struct gfs2_glock *gl)
 {
         struct gfs2_sbd *sdp = gl->gl_sbd;
-        struct gfs2_inode *ip = sdp->sd_jdesc->jd_inode->u.generic_ip;
+        struct gfs2_inode *ip = GFS2_I(sdp->sd_jdesc->jd_inode);
         struct gfs2_glock *j_gl = ip->i_gl;
         struct gfs2_log_header head;
         int error;
 
         if (gl->gl_state != LM_ST_UNLOCKED &&
             test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
-                gfs2_meta_cache_flush(sdp->sd_jdesc->jd_inode->u.generic_ip);
+                gfs2_meta_cache_flush(GFS2_I(sdp->sd_jdesc->jd_inode));
                 j_gl->gl_ops->go_inval(j_gl, DIO_METADATA | DIO_DATA);
 
                 error = gfs2_find_jhead(sdp->sd_jdesc, &head);