[GFS2] Merge the rd_last_alloc_meta and rd_last_alloc_data fields

We don't need to keep track of when we last allocated data
and metadata separately since the only thing thats important
when searching for a free block is whether its free or not,
which is independent from what type of block it is.

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

2 files changed, 7 insertions, 8 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index c50dcdf79929..898b456b386f 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -90,8 +90,7 @@ struct gfs2_rgrpd {
         struct mutex rd_mutex;
         u32 rd_free_clone;
         struct gfs2_log_element rd_le;
-        u32 rd_last_alloc_data;
-        u32 rd_last_alloc_meta;
+        u32 rd_last_alloc;
         struct gfs2_sbd *rd_sbd;
         unsigned char rd_flags;
 #define GFS2_RDF_CHECK        0x01      /* Need to check for unlinked inodes */
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 66193b45e50b..cc28845ba6fd 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1422,11 +1422,11 @@ u64 gfs2_alloc_data(struct gfs2_inode *ip)
         if (rgrp_contains_block(rgd, ip->i_goal))
                 goal = ip->i_goal - rgd->rd_data0;
         else
-                goal = rgd->rd_last_alloc_data;
+                goal = rgd->rd_last_alloc;
 
         blk = rgblk_search(rgd, goal, GFS2_BLKST_FREE, GFS2_BLKST_USED);
         BUG_ON(blk == BFITNOENT);
-        rgd->rd_last_alloc_data = blk;
+        rgd->rd_last_alloc = blk;
 
         block = rgd->rd_data0 + blk;
         ip->i_goal = block;
@@ -1467,11 +1467,11 @@ u64 gfs2_alloc_meta(struct gfs2_inode *ip)
         if (rgrp_contains_block(rgd, ip->i_goal))
                 goal = ip->i_goal - rgd->rd_data0;
         else
-                goal = rgd->rd_last_alloc_meta;
+                goal = rgd->rd_last_alloc;
 
         blk = rgblk_search(rgd, goal, GFS2_BLKST_FREE, GFS2_BLKST_USED);
         BUG_ON(blk == BFITNOENT);
-        rgd->rd_last_alloc_meta = blk;
+        rgd->rd_last_alloc = blk;
 
         block = rgd->rd_data0 + blk;
         ip->i_goal = block;
@@ -1510,11 +1510,11 @@ u64 gfs2_alloc_di(struct gfs2_inode *dip, u64 *generation)
         u32 blk;
         u64 block;
 
-        blk = rgblk_search(rgd, rgd->rd_last_alloc_meta,
+        blk = rgblk_search(rgd, rgd->rd_last_alloc,
                            GFS2_BLKST_FREE, GFS2_BLKST_DINODE);
         BUG_ON(blk == BFITNOENT);
 
-        rgd->rd_last_alloc_meta = blk;
+        rgd->rd_last_alloc = blk;
 
         block = rgd->rd_data0 + blk;