[GFS2] Fix a couple of refcount leaks.

recovery.c add a brelse to deal with gfs2_replay_read_block being called
twice on the same block.

add a dput to drop the ref count on the root inode.
This was causing lingering glocks and thus causing
a mount failure to hang.

Fix a endian conversion macro that was was swizzling
16bits when it should have been swizzling 32.

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

3 files changed, 12 insertions, 4 deletions

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index b6edf7c0923b..a5e16e539999 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -2167,7 +2167,9 @@ static int dump_glock(struct gfs2_glock *gl)
 
         spin_lock(&gl->gl_spin);
 
-        printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type,
+        printk(KERN_INFO "Glock 0x%p (%u, %llu)\n",
+               gl,
+               gl->gl_name.ln_type,
                (unsigned long long)gl->gl_name.ln_number);
         printk(KERN_INFO "  gl_flags =");
         for (x = 0; x < 32; x++)
@@ -2187,8 +2189,9 @@ static int dump_glock(struct gfs2_glock *gl)
         printk(KERN_INFO "  reclaim = %s\n",
                     (list_empty(&gl->gl_reclaim)) ? "no" : "yes");
         if (gl->gl_aspace)
-                printk(KERN_INFO "  aspace = %lu\n",
-                            gl->gl_aspace->i_mapping->nrpages);
+                printk(KERN_INFO "  aspace = 0x%p nrpages = %lu\n",
+                       gl->gl_aspace,
+                       gl->gl_aspace->i_mapping->nrpages);
         else
                 printk(KERN_INFO "  aspace = no\n");
         printk(KERN_INFO "  ail = %d\n", atomic_read(&gl->gl_ail_count));
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index de18923eea70..444000968cf4 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -279,6 +279,10 @@ static int init_sb(struct gfs2_sbd *sdp, int silent, int undo)
         int error = 0;
 
         if (undo) {
+                if (sb->s_root) {
+                        dput(sb->s_root);
+                        sb->s_root = NULL;
+                }
                 return 0;
         }
         
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index bbd44a4b1a1f..8fe518cfb3de 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -325,6 +325,7 @@ static int foreach_descriptor(struct gfs2_jdesc *jd, unsigned int start,
                         error = get_log_header(jd, start, &lh);
                         if (!error) {
                                 gfs2_replay_incr_blk(sdp, &start);
+                                brelse(bh);
                                 continue;
                         }
                         if (error == 1) {
@@ -396,7 +397,7 @@ static int clean_journal(struct gfs2_jdesc *jd, struct gfs2_log_header *head)
         lh = (struct gfs2_log_header *)bh->b_data;
         memset(lh, 0, sizeof(struct gfs2_log_header));
         lh->lh_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
-        lh->lh_header.mh_type = cpu_to_be16(GFS2_METATYPE_LH);
+        lh->lh_header.mh_type = cpu_to_be32(GFS2_METATYPE_LH);
         lh->lh_header.mh_format = cpu_to_be32(GFS2_FORMAT_LH);
         lh->lh_sequence = cpu_to_be64(head->lh_sequence + 1);
         lh->lh_flags = cpu_to_be32(GFS2_LOG_HEAD_UNMOUNT);