2 files changed, 21 insertions, 15 deletions

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 8dad6b093716..b906ed17a839 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -241,6 +241,7 @@ static u32 make_flags(struct gfs2_glock *gl, const unsigned int gfs_flags,
 
 static void gfs2_reverse_hex(char *c, u64 value)
 {
+        *c = '0';
         while (value) {
                 *c-- = hex_asc[value & 0x0f];
                 value >>= 4;
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 37ee061d899e..b7eff078fe90 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -350,10 +350,14 @@ static u32 gfs2_free_extlen(const struct gfs2_rbm *rrbm, u32 len)
                 BUG_ON(len < chunk_size);
                 len -= chunk_size;
                 block = gfs2_rbm_to_block(&rbm);
-                gfs2_rbm_from_block(&rbm, block + chunk_size);
-                n_unaligned = 3;
-                if (ptr)
+                if (gfs2_rbm_from_block(&rbm, block + chunk_size)) {
+                        n_unaligned = 0;
                         break;
+                }
+                if (ptr) {
+                        n_unaligned = 3;
+                        break;
+                }
                 n_unaligned = len & 3;
         }
 
@@ -557,22 +561,20 @@ void gfs2_free_clones(struct gfs2_rgrpd *rgd)
  */
 int gfs2_rs_alloc(struct gfs2_inode *ip)
 {
-        struct gfs2_blkreserv *res;
+        int error = 0;
 
+        down_write(&ip->i_rw_mutex);
         if (ip->i_res)
-                return 0;
-
-        res = kmem_cache_zalloc(gfs2_rsrv_cachep, GFP_NOFS);
-        if (!res)
-                return -ENOMEM;
+                goto out;
 
-        RB_CLEAR_NODE(&res->rs_node);
+        ip->i_res = kmem_cache_zalloc(gfs2_rsrv_cachep, GFP_NOFS);
+        if (!ip->i_res) {
+                error = -ENOMEM;
+                goto out;
+        }
 
-        down_write(&ip->i_rw_mutex);
-        if (ip->i_res)
-                kmem_cache_free(gfs2_rsrv_cachep, res);
-        else
-                ip->i_res = res;
+        RB_CLEAR_NODE(&ip->i_res->rs_node);
+out:
         up_write(&ip->i_rw_mutex);
         return 0;
 }
@@ -1424,6 +1426,9 @@ static void rg_mblk_search(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip,
                 rs->rs_free = extlen;
                 rs->rs_inum = ip->i_no_addr;
                 rs_insert(ip);
+        } else {
+                if (goal == rgd->rd_last_alloc + rgd->rd_data0)
+                        rgd->rd_last_alloc = 0;
         }
 }