gfs2: Move rs_{sizehint, rgd_gh} fields into the inode

Move the rs_sizehint and rs_rgd_gh fields from struct gfs2_blkreserv
into the inode: they are more closely related to the inode than to a
particular reservation.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>

4 files changed, 13 insertions, 15 deletions

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 6510f4e07d0e..45a17b770d97 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -361,8 +361,8 @@ static void gfs2_size_hint(struct file *filep, loff_t offset, size_t size)
         size_t blks = (size + sdp->sd_sb.sb_bsize - 1) >> sdp->sd_sb.sb_bsize_shift;
         int hint = min_t(size_t, INT_MAX, blks);
 
-        if (hint > atomic_read(&ip->i_res.rs_sizehint))
-                atomic_set(&ip->i_res.rs_sizehint, hint);
+        if (hint > atomic_read(&ip->i_sizehint))
+                atomic_set(&ip->i_sizehint, hint);
 }
 
 /**
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 5d72e8b66a26..997a3a19f77d 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -309,10 +309,6 @@ struct gfs2_qadata { /* quota allocation data */
 */
 
 struct gfs2_blkreserv {
-        /* components used during write (step 1): */
-        atomic_t rs_sizehint;         /* hint of the write size */
-
-        struct gfs2_holder rs_rgd_gh; /* Filled in by get_local_rgrp */
         struct rb_node rs_node;       /* link to other block reservations */
         struct gfs2_rbm rs_rbm;       /* Start of reservation */
         u32 rs_free;                  /* how many blocks are still free */
@@ -417,8 +413,10 @@ struct gfs2_inode {
         struct gfs2_holder i_iopen_gh;
         struct gfs2_holder i_gh; /* for prepare/commit_write only */
         struct gfs2_qadata *i_qadata; /* quota allocation data */
+        struct gfs2_holder i_rgd_gh;
         struct gfs2_blkreserv i_res; /* rgrp multi-block reservation */
         u64 i_goal;     /* goal block for allocations */
+        atomic_t i_sizehint;  /* hint of the write size */
         struct rw_semaphore i_rw_mutex;
         struct list_head i_ordered;
         struct list_head i_trunc_list;
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 2d55e2c3333c..c7603063f861 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -39,9 +39,11 @@ static void gfs2_init_inode_once(void *foo)
         struct gfs2_inode *ip = foo;
 
         inode_init_once(&ip->i_inode);
+        atomic_set(&ip->i_sizehint, 0);
         init_rwsem(&ip->i_rw_mutex);
         INIT_LIST_HEAD(&ip->i_trunc_list);
         ip->i_qadata = NULL;
+        gfs2_holder_mark_uninitialized(&ip->i_rgd_gh);
         memset(&ip->i_res, 0, sizeof(ip->i_res));
         RB_CLEAR_NODE(&ip->i_res.rs_node);
         ip->i_hash_cache = NULL;
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 6eb2addcbff5..3b17a4e77b39 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1565,7 +1565,7 @@ static void rg_mblk_search(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip,
         if (S_ISDIR(inode->i_mode))
                 extlen = 1;
         else {
-                extlen = max_t(u32, atomic_read(&rs->rs_sizehint), ap->target);
+                extlen = max_t(u32, atomic_read(&ip->i_sizehint), ap->target);
                 extlen = clamp(extlen, RGRP_RSRV_MINBLKS, free_blocks);
         }
         if ((rgd->rd_free_clone < rgd->rd_reserved) || (free_blocks < extlen))
@@ -2077,7 +2077,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, struct gfs2_alloc_parms *ap)
                         }
                         error = gfs2_glock_nq_init(rs->rs_rbm.rgd->rd_gl,
                                                    LM_ST_EXCLUSIVE, flags,
-                                                   &rs->rs_rgd_gh);
+                                                   &ip->i_rgd_gh);
                         if (unlikely(error))
                                 return error;
                         if (!gfs2_rs_active(rs) && (loops < 2) &&
@@ -2086,7 +2086,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, struct gfs2_alloc_parms *ap)
                         if (sdp->sd_args.ar_rgrplvb) {
                                 error = update_rgrp_lvb(rs->rs_rbm.rgd);
                                 if (unlikely(error)) {
-                                        gfs2_glock_dq_uninit(&rs->rs_rgd_gh);
+                                        gfs2_glock_dq_uninit(&ip->i_rgd_gh);
                                         return error;
                                 }
                         }
@@ -2129,7 +2129,7 @@ skip_rgrp:
 
                 /* Unlock rgrp if required */
                 if (!rg_locked)
-                        gfs2_glock_dq_uninit(&rs->rs_rgd_gh);
+                        gfs2_glock_dq_uninit(&ip->i_rgd_gh);
 next_rgrp:
                 /* Find the next rgrp, and continue looking */
                 if (gfs2_select_rgrp(&rs->rs_rbm.rgd, begin))
@@ -2166,10 +2166,8 @@ next_rgrp:
 
 void gfs2_inplace_release(struct gfs2_inode *ip)
 {
-        struct gfs2_blkreserv *rs = &ip->i_res;
-
-        if (gfs2_holder_initialized(&rs->rs_rgd_gh))
-                gfs2_glock_dq_uninit(&rs->rs_rgd_gh);
+        if (gfs2_holder_initialized(&ip->i_rgd_gh))
+                gfs2_glock_dq_uninit(&ip->i_rgd_gh);
 }
 
 /**
@@ -2328,7 +2326,7 @@ static void gfs2_adjust_reservation(struct gfs2_inode *ip,
                                 goto out;
                         /* We used up our block reservation, so we should
                            reserve more blocks next time. */
-                        atomic_add(RGRP_RSRV_ADDBLKS, &rs->rs_sizehint);
+                        atomic_add(RGRP_RSRV_ADDBLKS, &ip->i_sizehint);
                 }
                 __rs_deltree(rs);
         }