1 files changed, 34 insertions, 51 deletions

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index d1962b2f67f9..98a01db1f6dc 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -494,11 +494,11 @@ static void qdsb_put(struct gfs2_quota_data *qd)
 int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-        struct gfs2_alloc *al = ip->i_alloc;
-        struct gfs2_quota_data **qd = al->al_qd;
+        struct gfs2_qadata *qa = ip->i_qadata;
+        struct gfs2_quota_data **qd = qa->qa_qd;
         int error;
 
-        if (gfs2_assert_warn(sdp, !al->al_qd_num) ||
+        if (gfs2_assert_warn(sdp, !qa->qa_qd_num) ||
             gfs2_assert_warn(sdp, !test_bit(GIF_QD_LOCKED, &ip->i_flags)))
                 return -EIO;
 
@@ -508,20 +508,20 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
         error = qdsb_get(sdp, QUOTA_USER, ip->i_inode.i_uid, qd);
         if (error)
                 goto out;
-        al->al_qd_num++;
+        qa->qa_qd_num++;
         qd++;
 
         error = qdsb_get(sdp, QUOTA_GROUP, ip->i_inode.i_gid, qd);
         if (error)
                 goto out;
-        al->al_qd_num++;
+        qa->qa_qd_num++;
         qd++;
 
         if (uid != NO_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {
                 error = qdsb_get(sdp, QUOTA_USER, uid, qd);
                 if (error)
                         goto out;
-                al->al_qd_num++;
+                qa->qa_qd_num++;
                 qd++;
         }
 
@@ -529,7 +529,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
                 error = qdsb_get(sdp, QUOTA_GROUP, gid, qd);
                 if (error)
                         goto out;
-                al->al_qd_num++;
+                qa->qa_qd_num++;
                 qd++;
         }
 
@@ -542,16 +542,16 @@ out:
 void gfs2_quota_unhold(struct gfs2_inode *ip)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-        struct gfs2_alloc *al = ip->i_alloc;
+        struct gfs2_qadata *qa = ip->i_qadata;
         unsigned int x;
 
         gfs2_assert_warn(sdp, !test_bit(GIF_QD_LOCKED, &ip->i_flags));
 
-        for (x = 0; x < al->al_qd_num; x++) {
-                qdsb_put(al->al_qd[x]);
-                al->al_qd[x] = NULL;
+        for (x = 0; x < qa->qa_qd_num; x++) {
+                qdsb_put(qa->qa_qd[x]);
+                qa->qa_qd[x] = NULL;
         }
-        al->al_qd_num = 0;
+        qa->qa_qd_num = 0;
 }
 
 static int sort_qd(const void *a, const void *b)
@@ -762,7 +762,6 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
         struct gfs2_quota_data *qd;
         loff_t offset;
         unsigned int nalloc = 0, blocks;
-        struct gfs2_alloc *al = NULL;
         int error;
 
         gfs2_write_calc_reserv(ip, sizeof(struct gfs2_quota),
@@ -792,26 +791,19 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
                         nalloc++;
         }
 
-        al = gfs2_alloc_get(ip);
-        if (!al) {
-                error = -ENOMEM;
-                goto out_gunlock;
-        }
         /* 
          * 1 blk for unstuffing inode if stuffed. We add this extra
          * block to the reservation unconditionally. If the inode
          * doesn't need unstuffing, the block will be released to the 
          * rgrp since it won't be allocated during the transaction
          */
-        al->al_requested = 1;
         /* +3 in the end for unstuffing block, inode size update block
          * and another block in case quota straddles page boundary and 
          * two blocks need to be updated instead of 1 */
         blocks = num_qd * data_blocks + RES_DINODE + num_qd + 3;
 
-        if (nalloc)
-                al->al_requested += nalloc * (data_blocks + ind_blocks);                
-        error = gfs2_inplace_reserve(ip);
+        error = gfs2_inplace_reserve(ip, 1 +
+                                     (nalloc * (data_blocks + ind_blocks)));
         if (error)
                 goto out_alloc;
 
@@ -840,8 +832,6 @@ out_end_trans:
 out_ipres:
         gfs2_inplace_release(ip);
 out_alloc:
-        gfs2_alloc_put(ip);
-out_gunlock:
         gfs2_glock_dq_uninit(&i_gh);
 out:
         while (qx--)
@@ -925,7 +915,7 @@ fail:
 int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-        struct gfs2_alloc *al = ip->i_alloc;
+        struct gfs2_qadata *qa = ip->i_qadata;
         struct gfs2_quota_data *qd;
         unsigned int x;
         int error = 0;
@@ -938,15 +928,15 @@ int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)
             sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
                 return 0;
 
-        sort(al->al_qd, al->al_qd_num, sizeof(struct gfs2_quota_data *),
+        sort(qa->qa_qd, qa->qa_qd_num, sizeof(struct gfs2_quota_data *),
              sort_qd, NULL);
 
-        for (x = 0; x < al->al_qd_num; x++) {
+        for (x = 0; x < qa->qa_qd_num; x++) {
                 int force = NO_FORCE;
-                qd = al->al_qd[x];
+                qd = qa->qa_qd[x];
                 if (test_and_clear_bit(QDF_REFRESH, &qd->qd_flags))
                         force = FORCE;
-                error = do_glock(qd, force, &al->al_qd_ghs[x]);
+                error = do_glock(qd, force, &qa->qa_qd_ghs[x]);
                 if (error)
                         break;
         }
@@ -955,7 +945,7 @@ int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)
                 set_bit(GIF_QD_LOCKED, &ip->i_flags);
         else {
                 while (x--)
-                        gfs2_glock_dq_uninit(&al->al_qd_ghs[x]);
+                        gfs2_glock_dq_uninit(&qa->qa_qd_ghs[x]);
                 gfs2_quota_unhold(ip);
         }
 
@@ -1000,7 +990,7 @@ static int need_sync(struct gfs2_quota_data *qd)
 
 void gfs2_quota_unlock(struct gfs2_inode *ip)
 {
-        struct gfs2_alloc *al = ip->i_alloc;
+        struct gfs2_qadata *qa = ip->i_qadata;
         struct gfs2_quota_data *qda[4];
         unsigned int count = 0;
         unsigned int x;
@@ -1008,14 +998,14 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
         if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
                 goto out;
 
-        for (x = 0; x < al->al_qd_num; x++) {
+        for (x = 0; x < qa->qa_qd_num; x++) {
                 struct gfs2_quota_data *qd;
                 int sync;
 
-                qd = al->al_qd[x];
+                qd = qa->qa_qd[x];
                 sync = need_sync(qd);
 
-                gfs2_glock_dq_uninit(&al->al_qd_ghs[x]);
+                gfs2_glock_dq_uninit(&qa->qa_qd_ghs[x]);
 
                 if (sync && qd_trylock(qd))
                         qda[count++] = qd;
@@ -1048,7 +1038,7 @@ static int print_message(struct gfs2_quota_data *qd, char *type)
 int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
         struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
-        struct gfs2_alloc *al = ip->i_alloc;
+        struct gfs2_qadata *qa = ip->i_qadata;
         struct gfs2_quota_data *qd;
         s64 value;
         unsigned int x;
@@ -1060,8 +1050,8 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
         if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
                 return 0;
 
-        for (x = 0; x < al->al_qd_num; x++) {
-                qd = al->al_qd[x];
+        for (x = 0; x < qa->qa_qd_num; x++) {
+                qd = qa->qa_qd[x];
 
                 if (!((qd->qd_id == uid && test_bit(QDF_USER, &qd->qd_flags)) ||
                       (qd->qd_id == gid && !test_bit(QDF_USER, &qd->qd_flags))))
@@ -1099,7 +1089,7 @@ int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
 void gfs2_quota_change(struct gfs2_inode *ip, s64 change,
                        u32 uid, u32 gid)
 {
-        struct gfs2_alloc *al = ip->i_alloc;
+        struct gfs2_qadata *qa = ip->i_qadata;
         struct gfs2_quota_data *qd;
         unsigned int x;
 
@@ -1108,8 +1098,8 @@ void gfs2_quota_change(struct gfs2_inode *ip, s64 change,
         if (ip->i_diskflags & GFS2_DIF_SYSTEM)
                 return;
 
-        for (x = 0; x < al->al_qd_num; x++) {
-                qd = al->al_qd[x];
+        for (x = 0; x < qa->qa_qd_num; x++) {
+                qd = qa->qa_qd[x];
 
                 if ((qd->qd_id == uid && test_bit(QDF_USER, &qd->qd_flags)) ||
                     (qd->qd_id == gid && !test_bit(QDF_USER, &qd->qd_flags))) {
@@ -1529,7 +1519,6 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id,
         unsigned int data_blocks, ind_blocks;
         unsigned int blocks = 0;
         int alloc_required;
-        struct gfs2_alloc *al;
         loff_t offset;
         int error;
 
@@ -1594,15 +1583,12 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id,
         if (gfs2_is_stuffed(ip))
                 alloc_required = 1;
         if (alloc_required) {
-                al = gfs2_alloc_get(ip);
-                if (al == NULL)
-                        goto out_i;
                 gfs2_write_calc_reserv(ip, sizeof(struct gfs2_quota),
                                        &data_blocks, &ind_blocks);
-                blocks = al->al_requested = 1 + data_blocks + ind_blocks;
-                error = gfs2_inplace_reserve(ip);
+                blocks = 1 + data_blocks + ind_blocks;
+                error = gfs2_inplace_reserve(ip, blocks);
                 if (error)
-                        goto out_alloc;
+                        goto out_i;
                 blocks += gfs2_rg_blocks(ip);
         }
 
@@ -1617,11 +1603,8 @@ static int gfs2_set_dqblk(struct super_block *sb, int type, qid_t id,
 
         gfs2_trans_end(sdp);
 out_release:
-        if (alloc_required) {
+        if (alloc_required)
                 gfs2_inplace_release(ip);
-out_alloc:
-                gfs2_alloc_put(ip);
-        }
 out_i:
         gfs2_glock_dq_uninit(&i_gh);
 out_q: