GFS2: Fold quota data into the reservations struct

This patch moves the ancillary quota data structures into the
block reservations structure. This saves GFS2 some time and
effort in allocating and deallocating the qadata structure.

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

1 files changed, 5 insertions, 8 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 67fd6beffec..5cda51a3e3b 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -289,16 +289,14 @@ struct gfs2_glock {
 
 #define GFS2_MIN_LVB_SIZE 32    /* Min size of LVB that gfs2 supports */
 
-struct gfs2_qadata { /* quota allocation data */
-        /* Quota stuff */
-        struct gfs2_quota_data *qa_qd[2*MAXQUOTAS];
-        struct gfs2_holder qa_qd_ghs[2*MAXQUOTAS];
-        unsigned int qa_qd_num;
-};
-
 struct gfs2_blkreserv {
         u32 rs_requested; /* Filled in by caller of gfs2_inplace_reserve() */
         struct gfs2_holder rs_rgd_gh; /* Filled in by gfs2_inplace_reserve() */
+
+        /* ancillary quota stuff */
+        struct gfs2_quota_data *rs_qa_qd[2 * MAXQUOTAS];
+        struct gfs2_holder rs_qa_qd_ghs[2 * MAXQUOTAS];
+        unsigned int rs_qa_qd_num;
 };
 
 enum {
@@ -319,7 +317,6 @@ struct gfs2_inode {
         struct gfs2_glock *i_gl; /* Move into i_gh? */
         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_blkreserv *i_res; /* resource group block reservation */
         struct gfs2_rgrpd *i_rgd;
         u64 i_goal;     /* goal block for allocations */