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, 6 insertions, 16 deletions

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 37906174d417..26e2905070ed 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -366,7 +366,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         u64 pos = page->index << PAGE_CACHE_SHIFT;
         unsigned int data_blocks, ind_blocks, rblocks;
         struct gfs2_holder gh;
-        struct gfs2_qadata *qa;
         loff_t size;
         int ret;
 
@@ -397,14 +396,13 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
                 goto out_unlock;
         }
 
-        ret = -ENOMEM;
-        qa = gfs2_qadata_get(ip);
-        if (qa == NULL)
+        ret = gfs2_rindex_update(sdp);
+        if (ret)
                 goto out_unlock;
 
         ret = gfs2_quota_lock_check(ip);
         if (ret)
-                goto out_alloc_put;
+                goto out_unlock;
         gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);
         ret = gfs2_inplace_reserve(ip, data_blocks + ind_blocks);
         if (ret)
@@ -451,8 +449,6 @@ out_trans_fail:
         gfs2_inplace_release(ip);
 out_quota_unlock:
         gfs2_quota_unlock(ip);
-out_alloc_put:
-        gfs2_qadata_put(ip);
 out_unlock:
         gfs2_glock_dq(&gh);
 out:
@@ -764,7 +760,6 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset,
         struct gfs2_inode *ip = GFS2_I(inode);
         unsigned int data_blocks = 0, ind_blocks = 0, rblocks;
         loff_t bytes, max_bytes;
-        struct gfs2_qadata *qa;
         int error;
         const loff_t pos = offset;
         const loff_t count = len;
@@ -804,15 +799,13 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset,
                         offset += bytes;
                         continue;
                 }
-                qa = gfs2_qadata_get(ip);
-                if (!qa) {
-                        error = -ENOMEM;
+                error = gfs2_rindex_update(sdp);
+                if (error)
                         goto out_unlock;
-                }
 
                 error = gfs2_quota_lock_check(ip);
                 if (error)
-                        goto out_alloc_put;
+                        goto out_unlock;
 
 retry:
                 gfs2_write_calc_reserv(ip, bytes, &data_blocks, &ind_blocks);
@@ -852,7 +845,6 @@ retry:
                 offset += max_bytes;
                 gfs2_inplace_release(ip);
                 gfs2_quota_unlock(ip);
-                gfs2_qadata_put(ip);
         }
 
         if (error == 0)
@@ -863,8 +855,6 @@ out_trans_fail:
         gfs2_inplace_release(ip);
 out_qunlock:
         gfs2_quota_unlock(ip);
-out_alloc_put:
-        gfs2_qadata_put(ip);
 out_unlock:
         gfs2_glock_dq(&ip->i_gh);
 out_uninit: