Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[safe/jmp/linux-2.6] / fs / gfs2 / quota.c
index 5fb5a53..152e6c4 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 /*
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <linux/tty.h>
 #include <linux/sort.h>
-#include <asm/semaphore.h>
+#include <linux/fs.h>
+#include <linux/bio.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include "gfs2.h"
+#include "incore.h"
 #include "bmap.h"
 #include "glock.h"
 #include "glops.h"
-#include "jdata.h"
 #include "log.h"
 #include "meta_io.h"
 #include "quota.h"
 #include "rgrp.h"
 #include "super.h"
 #include "trans.h"
+#include "inode.h"
+#include "ops_address.h"
+#include "util.h"
 
 #define QUOTA_USER 1
 #define QUOTA_GROUP 0
 
-static uint64_t qd2offset(struct gfs2_quota_data *qd)
+struct gfs2_quota_host {
+       u64 qu_limit;
+       u64 qu_warn;
+       s64 qu_value;
+       u32 qu_ll_next;
+};
+
+struct gfs2_quota_change_host {
+       u64 qc_change;
+       u32 qc_flags; /* GFS2_QCF_... */
+       u32 qc_id;
+};
+
+static LIST_HEAD(qd_lru_list);
+static atomic_t qd_lru_count = ATOMIC_INIT(0);
+static DEFINE_SPINLOCK(qd_lru_lock);
+
+int gfs2_shrink_qd_memory(int nr, gfp_t gfp_mask)
 {
-       uint64_t offset;
+       struct gfs2_quota_data *qd;
+       struct gfs2_sbd *sdp;
+
+       if (nr == 0)
+               goto out;
 
-       offset = 2 * (uint64_t)qd->qd_id + !test_bit(QDF_USER, &qd->qd_flags);
+       if (!(gfp_mask & __GFP_FS))
+               return -1;
+
+       spin_lock(&qd_lru_lock);
+       while (nr && !list_empty(&qd_lru_list)) {
+               qd = list_entry(qd_lru_list.next,
+                               struct gfs2_quota_data, qd_reclaim);
+               sdp = qd->qd_gl->gl_sbd;
+
+               /* Free from the filesystem-specific list */
+               list_del(&qd->qd_list);
+
+               gfs2_assert_warn(sdp, !qd->qd_change);
+               gfs2_assert_warn(sdp, !qd->qd_slot_count);
+               gfs2_assert_warn(sdp, !qd->qd_bh_count);
+
+               gfs2_glock_put(qd->qd_gl);
+               atomic_dec(&sdp->sd_quota_count);
+
+               /* Delete it from the common reclaim list */
+               list_del_init(&qd->qd_reclaim);
+               atomic_dec(&qd_lru_count);
+               spin_unlock(&qd_lru_lock);
+               kmem_cache_free(gfs2_quotad_cachep, qd);
+               spin_lock(&qd_lru_lock);
+               nr--;
+       }
+       spin_unlock(&qd_lru_lock);
+
+out:
+       return (atomic_read(&qd_lru_count) * sysctl_vfs_cache_pressure) / 100;
+}
+
+static u64 qd2offset(struct gfs2_quota_data *qd)
+{
+       u64 offset;
+
+       offset = 2 * (u64)qd->qd_id + !test_bit(QDF_USER, &qd->qd_flags);
        offset *= sizeof(struct gfs2_quota);
 
        return offset;
 }
 
-static int qd_alloc(struct gfs2_sbd *sdp, int user, uint32_t id,
+static int qd_alloc(struct gfs2_sbd *sdp, int user, u32 id,
                    struct gfs2_quota_data **qdp)
 {
        struct gfs2_quota_data *qd;
        int error;
 
-       qd = kzalloc(sizeof(struct gfs2_quota_data), GFP_KERNEL);
+       qd = kmem_cache_zalloc(gfs2_quotad_cachep, GFP_NOFS);
        if (!qd)
                return -ENOMEM;
 
-       qd->qd_count = 1;
+       atomic_set(&qd->qd_count, 1);
        qd->qd_id = id;
        if (user)
                set_bit(QDF_USER, &qd->qd_flags);
        qd->qd_slot = -1;
+       INIT_LIST_HEAD(&qd->qd_reclaim);
 
-       error = gfs2_glock_get(sdp, 2 * (uint64_t)id + !user,
+       error = gfs2_glock_get(sdp, 2 * (u64)id + !user,
                              &gfs2_quota_glops, CREATE, &qd->qd_gl);
        if (error)
                goto fail;
 
-       error = gfs2_lvb_hold(qd->qd_gl);
-       gfs2_glock_put(qd->qd_gl);
-       if (error)
-               goto fail;
-
        *qdp = qd;
 
        return 0;
 
- fail:
-       kfree(qd);
+fail:
+       kmem_cache_free(gfs2_quotad_cachep, qd);
        return error;
 }
 
-static int qd_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
+static int qd_get(struct gfs2_sbd *sdp, int user, u32 id, int create,
                  struct gfs2_quota_data **qdp)
 {
        struct gfs2_quota_data *qd = NULL, *new_qd = NULL;
@@ -115,11 +175,17 @@ static int qd_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
 
        for (;;) {
                found = 0;
-               spin_lock(&sdp->sd_quota_spin);
+               spin_lock(&qd_lru_lock);
                list_for_each_entry(qd, &sdp->sd_quota_list, qd_list) {
                        if (qd->qd_id == id &&
                            !test_bit(QDF_USER, &qd->qd_flags) == !user) {
-                               qd->qd_count++;
+                               if (!atomic_read(&qd->qd_count) &&
+                                   !list_empty(&qd->qd_reclaim)) {
+                                       /* Remove it from reclaim list */
+                                       list_del_init(&qd->qd_reclaim);
+                                       atomic_dec(&qd_lru_count);
+                               }
+                               atomic_inc(&qd->qd_count);
                                found = 1;
                                break;
                        }
@@ -135,12 +201,12 @@ static int qd_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
                        new_qd = NULL;
                }
 
-               spin_unlock(&sdp->sd_quota_spin);
+               spin_unlock(&qd_lru_lock);
 
                if (qd || !create) {
                        if (new_qd) {
-                               gfs2_lvb_unhold(new_qd->qd_gl);
-                               kfree(new_qd);
+                               gfs2_glock_put(new_qd->qd_gl);
+                               kmem_cache_free(gfs2_quotad_cachep, new_qd);
                        }
                        *qdp = qd;
                        return 0;
@@ -155,21 +221,18 @@ static int qd_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
 static void qd_hold(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-
-       spin_lock(&sdp->sd_quota_spin);
-       gfs2_assert(sdp, qd->qd_count);
-       qd->qd_count++;
-       spin_unlock(&sdp->sd_quota_spin);
+       gfs2_assert(sdp, atomic_read(&qd->qd_count));
+       atomic_inc(&qd->qd_count);
 }
 
 static void qd_put(struct gfs2_quota_data *qd)
 {
-       struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-       spin_lock(&sdp->sd_quota_spin);
-       gfs2_assert(sdp, qd->qd_count);
-       if (!--qd->qd_count)
-               qd->qd_last_touched = jiffies;
-       spin_unlock(&sdp->sd_quota_spin);
+       if (atomic_dec_and_lock(&qd->qd_count, &qd_lru_lock)) {
+               /* Add to the reclaim list */
+               list_add_tail(&qd->qd_reclaim, &qd_lru_list);
+               atomic_inc(&qd_lru_count);
+               spin_unlock(&qd_lru_lock);
+       }
 }
 
 static int slot_get(struct gfs2_quota_data *qd)
@@ -178,10 +241,10 @@ static int slot_get(struct gfs2_quota_data *qd)
        unsigned int c, o = 0, b;
        unsigned char byte = 0;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
 
        if (qd->qd_slot_count++) {
-               spin_unlock(&sdp->sd_quota_spin);
+               spin_unlock(&qd_lru_lock);
                return 0;
        }
 
@@ -194,7 +257,7 @@ static int slot_get(struct gfs2_quota_data *qd)
 
        goto fail;
 
- found:
+found:
        for (b = 0; b < 8; b++)
                if (!(byte & (1 << b)))
                        break;
@@ -205,13 +268,13 @@ static int slot_get(struct gfs2_quota_data *qd)
 
        sdp->sd_quota_bitmap[c][o] |= 1 << b;
 
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        return 0;
 
- fail:
+fail:
        qd->qd_slot_count--;
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
        return -ENOSPC;
 }
 
@@ -219,49 +282,49 @@ static void slot_hold(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
        gfs2_assert(sdp, qd->qd_slot_count);
        qd->qd_slot_count++;
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 }
 
 static void slot_put(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
        gfs2_assert(sdp, qd->qd_slot_count);
        if (!--qd->qd_slot_count) {
                gfs2_icbit_munge(sdp, sdp->sd_quota_bitmap, qd->qd_slot, 0);
                qd->qd_slot = -1;
        }
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 }
 
 static int bh_get(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-       struct gfs2_inode *ip = sdp->sd_qc_inode;
+       struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode);
        unsigned int block, offset;
-       uint64_t dblock;
-       int new = 0;
        struct buffer_head *bh;
        int error;
+       struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 };
 
-       down(&sdp->sd_quota_mutex);
+       mutex_lock(&sdp->sd_quota_mutex);
 
        if (qd->qd_bh_count++) {
-               up(&sdp->sd_quota_mutex);
+               mutex_unlock(&sdp->sd_quota_mutex);
                return 0;
        }
 
        block = qd->qd_slot / sdp->sd_qc_per_block;
-       offset = qd->qd_slot % sdp->sd_qc_per_block;;
+       offset = qd->qd_slot % sdp->sd_qc_per_block;
 
-       error = gfs2_block_map(ip, block, &new, &dblock, NULL);
+       bh_map.b_size = 1 << ip->i_inode.i_blkbits;
+       error = gfs2_block_map(&ip->i_inode, block, &bh_map, 0);
        if (error)
                goto fail;
-       error = gfs2_meta_read(ip->i_gl, dblock, DIO_START | DIO_WAIT, &bh);
+       error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh);
        if (error)
                goto fail;
        error = -EIO;
@@ -273,16 +336,15 @@ static int bh_get(struct gfs2_quota_data *qd)
                (bh->b_data + sizeof(struct gfs2_meta_header) +
                 offset * sizeof(struct gfs2_quota_change));
 
-       up(&sdp->sd_quota_mutex);
+       mutex_unlock(&sdp->sd_quota_mutex);
 
        return 0;
 
- fail_brelse:
+fail_brelse:
        brelse(bh);
-
- fail:
+fail:
        qd->qd_bh_count--;
-       up(&sdp->sd_quota_mutex);
+       mutex_unlock(&sdp->sd_quota_mutex);
        return error;
 }
 
@@ -290,14 +352,14 @@ static void bh_put(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
 
-       down(&sdp->sd_quota_mutex);
+       mutex_lock(&sdp->sd_quota_mutex);
        gfs2_assert(sdp, qd->qd_bh_count);
        if (!--qd->qd_bh_count) {
                brelse(qd->qd_bh);
                qd->qd_bh = NULL;
                qd->qd_bh_qc = NULL;
        }
-       up(&sdp->sd_quota_mutex);
+       mutex_unlock(&sdp->sd_quota_mutex);
 }
 
 static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
@@ -311,7 +373,7 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
        if (sdp->sd_vfs->s_flags & MS_RDONLY)
                return 0;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
 
        list_for_each_entry(qd, &sdp->sd_quota_list, qd_list) {
                if (test_bit(QDF_LOCKED, &qd->qd_flags) ||
@@ -322,8 +384,8 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
                list_move_tail(&qd->qd_list, &sdp->sd_quota_list);
 
                set_bit(QDF_LOCKED, &qd->qd_flags);
-               gfs2_assert_warn(sdp, qd->qd_count);
-               qd->qd_count++;
+               gfs2_assert_warn(sdp, atomic_read(&qd->qd_count));
+               atomic_inc(&qd->qd_count);
                qd->qd_change_sync = qd->qd_change;
                gfs2_assert_warn(sdp, qd->qd_slot_count);
                qd->qd_slot_count++;
@@ -335,7 +397,7 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp)
        if (!found)
                qd = NULL;
 
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        if (qd) {
                gfs2_assert_warn(sdp, qd->qd_change_sync);
@@ -360,24 +422,24 @@ static int qd_trylock(struct gfs2_quota_data *qd)
        if (sdp->sd_vfs->s_flags & MS_RDONLY)
                return 0;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
 
        if (test_bit(QDF_LOCKED, &qd->qd_flags) ||
            !test_bit(QDF_CHANGE, &qd->qd_flags)) {
-               spin_unlock(&sdp->sd_quota_spin);
+               spin_unlock(&qd_lru_lock);
                return 0;
        }
 
        list_move_tail(&qd->qd_list, &sdp->sd_quota_list);
 
        set_bit(QDF_LOCKED, &qd->qd_flags);
-       gfs2_assert_warn(sdp, qd->qd_count);
-       qd->qd_count++;
+       gfs2_assert_warn(sdp, atomic_read(&qd->qd_count));
+       atomic_inc(&qd->qd_count);
        qd->qd_change_sync = qd->qd_change;
        gfs2_assert_warn(sdp, qd->qd_slot_count);
        qd->qd_slot_count++;
 
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        gfs2_assert_warn(sdp, qd->qd_change_sync);
        if (bh_get(qd)) {
@@ -392,14 +454,15 @@ static int qd_trylock(struct gfs2_quota_data *qd)
 
 static void qd_unlock(struct gfs2_quota_data *qd)
 {
-       gfs2_assert_warn(qd->qd_gl->gl_sbd, test_bit(QDF_LOCKED, &qd->qd_flags));
+       gfs2_assert_warn(qd->qd_gl->gl_sbd,
+                        test_bit(QDF_LOCKED, &qd->qd_flags));
        clear_bit(QDF_LOCKED, &qd->qd_flags);
        bh_put(qd);
        slot_put(qd);
        qd_put(qd);
 }
 
-static int qdsb_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
+static int qdsb_get(struct gfs2_sbd *sdp, int user, u32 id, int create,
                    struct gfs2_quota_data **qdp)
 {
        int error;
@@ -418,10 +481,9 @@ static int qdsb_get(struct gfs2_sbd *sdp, int user, uint32_t id, int create,
 
        return 0;
 
- fail_slot:
+fail_slot:
        slot_put(*qdp);
-
- fail:
+fail:
        qd_put(*qdp);
        return error;
 }
@@ -433,10 +495,10 @@ static void qdsb_put(struct gfs2_quota_data *qd)
        qd_put(qd);
 }
 
-int gfs2_quota_hold(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
+int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
-       struct gfs2_sbd *sdp = ip->i_sbd;
-       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+       struct gfs2_alloc *al = ip->i_alloc;
        struct gfs2_quota_data **qd = al->al_qd;
        int error;
 
@@ -447,19 +509,19 @@ int gfs2_quota_hold(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
        if (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF)
                return 0;
 
-       error = qdsb_get(sdp, QUOTA_USER, ip->i_di.di_uid, CREATE, qd);
+       error = qdsb_get(sdp, QUOTA_USER, ip->i_inode.i_uid, CREATE, qd);
        if (error)
                goto out;
        al->al_qd_num++;
        qd++;
 
-       error = qdsb_get(sdp, QUOTA_GROUP, ip->i_di.di_gid, CREATE, qd);
+       error = qdsb_get(sdp, QUOTA_GROUP, ip->i_inode.i_gid, CREATE, qd);
        if (error)
                goto out;
        al->al_qd_num++;
        qd++;
 
-       if (uid != NO_QUOTA_CHANGE && uid != ip->i_di.di_uid) {
+       if (uid != NO_QUOTA_CHANGE && uid != ip->i_inode.i_uid) {
                error = qdsb_get(sdp, QUOTA_USER, uid, CREATE, qd);
                if (error)
                        goto out;
@@ -467,7 +529,7 @@ int gfs2_quota_hold(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
                qd++;
        }
 
-       if (gid != NO_QUOTA_CHANGE && gid != ip->i_di.di_gid) {
+       if (gid != NO_QUOTA_CHANGE && gid != ip->i_inode.i_gid) {
                error = qdsb_get(sdp, QUOTA_GROUP, gid, CREATE, qd);
                if (error)
                        goto out;
@@ -475,17 +537,16 @@ int gfs2_quota_hold(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
                qd++;
        }
 
- out:
+out:
        if (error)
                gfs2_quota_unhold(ip);
-
        return error;
 }
 
 void gfs2_quota_unhold(struct gfs2_inode *ip)
 {
-       struct gfs2_sbd *sdp = ip->i_sbd;
-       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+       struct gfs2_alloc *al = ip->i_alloc;
        unsigned int x;
 
        gfs2_assert_warn(sdp, !test_bit(GIF_QD_LOCKED, &ip->i_flags));
@@ -499,34 +560,32 @@ void gfs2_quota_unhold(struct gfs2_inode *ip)
 
 static int sort_qd(const void *a, const void *b)
 {
-       struct gfs2_quota_data *qd_a = *(struct gfs2_quota_data **)a;
-       struct gfs2_quota_data *qd_b = *(struct gfs2_quota_data **)b;
-       int ret = 0;
+       const struct gfs2_quota_data *qd_a = *(const struct gfs2_quota_data **)a;
+       const struct gfs2_quota_data *qd_b = *(const struct gfs2_quota_data **)b;
 
        if (!test_bit(QDF_USER, &qd_a->qd_flags) !=
            !test_bit(QDF_USER, &qd_b->qd_flags)) {
                if (test_bit(QDF_USER, &qd_a->qd_flags))
-                       ret = -1;
+                       return -1;
                else
-                       ret = 1;
-       } else {
-               if (qd_a->qd_id < qd_b->qd_id)
-                       ret = -1;
-               else if (qd_a->qd_id > qd_b->qd_id)
-                       ret = 1;
+                       return 1;
        }
+       if (qd_a->qd_id < qd_b->qd_id)
+               return -1;
+       if (qd_a->qd_id > qd_b->qd_id)
+               return 1;
 
-       return ret;
+       return 0;
 }
 
-static void do_qc(struct gfs2_quota_data *qd, int64_t change)
+static void do_qc(struct gfs2_quota_data *qd, s64 change)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-       struct gfs2_inode *ip = sdp->sd_qc_inode;
+       struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode);
        struct gfs2_quota_change *qc = qd->qd_bh_qc;
-       int64_t x;
+       s64 x;
 
-       down(&sdp->sd_quota_mutex);
+       mutex_lock(&sdp->sd_quota_mutex);
        gfs2_trans_add_bh(ip->i_gl, qd->qd_bh, 1);
 
        if (!test_bit(QDF_CHANGE, &qd->qd_flags)) {
@@ -537,13 +596,12 @@ static void do_qc(struct gfs2_quota_data *qd, int64_t change)
                qc->qc_id = cpu_to_be32(qd->qd_id);
        }
 
-       x = qc->qc_change;
-       x = be64_to_cpu(x) + change;
+       x = be64_to_cpu(qc->qc_change) + change;
        qc->qc_change = cpu_to_be64(x);
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
        qd->qd_change = x;
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        if (!x) {
                gfs2_assert_warn(sdp, test_bit(QDF_CHANGE, &qd->qd_flags));
@@ -556,27 +614,128 @@ static void do_qc(struct gfs2_quota_data *qd, int64_t change)
                qd_hold(qd);
                slot_hold(qd);
        }
-                       
-       up(&sdp->sd_quota_mutex);
+
+       mutex_unlock(&sdp->sd_quota_mutex);
+}
+
+static void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf)
+{
+       const struct gfs2_quota *str = buf;
+
+       qu->qu_limit = be64_to_cpu(str->qu_limit);
+       qu->qu_warn = be64_to_cpu(str->qu_warn);
+       qu->qu_value = be64_to_cpu(str->qu_value);
+       qu->qu_ll_next = be32_to_cpu(str->qu_ll_next);
+}
+
+static void gfs2_quota_out(const struct gfs2_quota_host *qu, void *buf)
+{
+       struct gfs2_quota *str = buf;
+
+       str->qu_limit = cpu_to_be64(qu->qu_limit);
+       str->qu_warn = cpu_to_be64(qu->qu_warn);
+       str->qu_value = cpu_to_be64(qu->qu_value);
+       str->qu_ll_next = cpu_to_be32(qu->qu_ll_next);
+       memset(&str->qu_reserved, 0, sizeof(str->qu_reserved));
+}
+
+/**
+ * gfs2_adjust_quota
+ *
+ * This function was mostly borrowed from gfs2_block_truncate_page which was
+ * in turn mostly borrowed from ext3
+ */
+static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
+                            s64 change, struct gfs2_quota_data *qd)
+{
+       struct inode *inode = &ip->i_inode;
+       struct address_space *mapping = inode->i_mapping;
+       unsigned long index = loc >> PAGE_CACHE_SHIFT;
+       unsigned offset = loc & (PAGE_CACHE_SIZE - 1);
+       unsigned blocksize, iblock, pos;
+       struct buffer_head *bh;
+       struct page *page;
+       void *kaddr;
+       char *ptr;
+       struct gfs2_quota_host qp;
+       s64 value;
+       int err = -EIO;
+
+       if (gfs2_is_stuffed(ip))
+               gfs2_unstuff_dinode(ip, NULL);
+       
+       page = grab_cache_page(mapping, index);
+       if (!page)
+               return -ENOMEM;
+
+       blocksize = inode->i_sb->s_blocksize;
+       iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
+
+       if (!page_has_buffers(page))
+               create_empty_buffers(page, blocksize, 0);
+
+       bh = page_buffers(page);
+       pos = blocksize;
+       while (offset >= pos) {
+               bh = bh->b_this_page;
+               iblock++;
+               pos += blocksize;
+       }
+
+       if (!buffer_mapped(bh)) {
+               gfs2_block_map(inode, iblock, bh, 1);
+               if (!buffer_mapped(bh))
+                       goto unlock;
+       }
+
+       if (PageUptodate(page))
+               set_buffer_uptodate(bh);
+
+       if (!buffer_uptodate(bh)) {
+               ll_rw_block(READ_META, 1, &bh);
+               wait_on_buffer(bh);
+               if (!buffer_uptodate(bh))
+                       goto unlock;
+       }
+
+       gfs2_trans_add_bh(ip->i_gl, bh, 0);
+
+       kaddr = kmap_atomic(page, KM_USER0);
+       ptr = kaddr + offset;
+       gfs2_quota_in(&qp, ptr);
+       qp.qu_value += change;
+       value = qp.qu_value;
+       gfs2_quota_out(&qp, ptr);
+       flush_dcache_page(page);
+       kunmap_atomic(kaddr, KM_USER0);
+       err = 0;
+       qd->qd_qb.qb_magic = cpu_to_be32(GFS2_MAGIC);
+       qd->qd_qb.qb_value = cpu_to_be64(value);
+       ((struct gfs2_quota_lvb*)(qd->qd_gl->gl_lvb))->qb_magic = cpu_to_be32(GFS2_MAGIC);
+       ((struct gfs2_quota_lvb*)(qd->qd_gl->gl_lvb))->qb_value = cpu_to_be64(value);
+unlock:
+       unlock_page(page);
+       page_cache_release(page);
+       return err;
 }
 
 static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
 {
        struct gfs2_sbd *sdp = (*qda)->qd_gl->gl_sbd;
-       struct gfs2_inode *ip = sdp->sd_quota_inode;
+       struct gfs2_inode *ip = GFS2_I(sdp->sd_quota_inode);
        unsigned int data_blocks, ind_blocks;
        struct gfs2_holder *ghs, i_gh;
        unsigned int qx, x;
        struct gfs2_quota_data *qd;
-       uint64_t offset;
-       unsigned int nalloc = 0;
+       loff_t offset;
+       unsigned int nalloc = 0, blocks;
        struct gfs2_alloc *al = NULL;
        int error;
 
        gfs2_write_calc_reserv(ip, sizeof(struct gfs2_quota),
                              &data_blocks, &ind_blocks);
 
-       ghs = kcalloc(num_qd, sizeof(struct gfs2_holder), GFP_KERNEL);
+       ghs = kcalloc(num_qd, sizeof(struct gfs2_holder), GFP_NOFS);
        if (!ghs)
                return -ENOMEM;
 
@@ -606,93 +765,61 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
                        nalloc++;
        }
 
-       if (nalloc) {
-               al = gfs2_alloc_get(ip);
+       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;
+       /* +1 in the end for block requested above for unstuffing */
+       blocks = num_qd * data_blocks + RES_DINODE + num_qd + 1;
 
-               al->al_requested = nalloc * (data_blocks + ind_blocks);
+       if (nalloc)
+               al->al_requested += nalloc * (data_blocks + ind_blocks);                
+       error = gfs2_inplace_reserve(ip);
+       if (error)
+               goto out_alloc;
 
-               error = gfs2_inplace_reserve(ip);
-               if (error)
-                       goto out_alloc;
-
-               error = gfs2_trans_begin(sdp,
-                                        al->al_rgd->rd_ri.ri_length +
-                                        num_qd * data_blocks +
-                                        nalloc * ind_blocks +
-                                        RES_DINODE + num_qd +
-                                        RES_STATFS, 0);
-               if (error)
-                       goto out_ipres;
-       } else {
-               error = gfs2_trans_begin(sdp,
-                                        num_qd * data_blocks +
-                                        RES_DINODE + num_qd, 0);
-               if (error)
-                       goto out_gunlock;
-       }
+       if (nalloc)
+               blocks += al->al_rgd->rd_length + nalloc * ind_blocks + RES_STATFS;
 
-       for (x = 0; x < num_qd; x++) {
-               char buf[sizeof(struct gfs2_quota)];
-               struct gfs2_quota q;
+       error = gfs2_trans_begin(sdp, blocks, 0);
+       if (error)
+               goto out_ipres;
 
+       for (x = 0; x < num_qd; x++) {
                qd = qda[x];
                offset = qd2offset(qd);
-
-               /* The quota file may not be a multiple of
-                  sizeof(struct gfs2_quota) bytes. */
-               memset(buf, 0, sizeof(struct gfs2_quota));
-
-               error = gfs2_jdata_read_mem(ip, buf, offset,
-                                           sizeof(struct gfs2_quota));
-               if (error < 0)
-                       goto out_end_trans;
-
-               gfs2_quota_in(&q, buf);
-               q.qu_value += qda[x]->qd_change_sync;
-               gfs2_quota_out(&q, buf);
-
-               error = gfs2_jdata_write_mem(ip, buf, offset,
-                                            sizeof(struct gfs2_quota));
-               if (error < 0)
-                       goto out_end_trans;
-               else if (error != sizeof(struct gfs2_quota)) {
-                       error = -EIO;
+               error = gfs2_adjust_quota(ip, offset, qd->qd_change_sync,
+                                         (struct gfs2_quota_data *)
+                                         qd);
+               if (error)
                        goto out_end_trans;
-               }
 
                do_qc(qd, -qd->qd_change_sync);
-
-               memset(&qd->qd_qb, 0, sizeof(struct gfs2_quota_lvb));
-               qd->qd_qb.qb_magic = GFS2_MAGIC;
-               qd->qd_qb.qb_limit = q.qu_limit;
-               qd->qd_qb.qb_warn = q.qu_warn;
-               qd->qd_qb.qb_value = q.qu_value;
-
-               gfs2_quota_lvb_out(&qd->qd_qb, qd->qd_gl->gl_lvb);
        }
 
        error = 0;
 
- out_end_trans:
+out_end_trans:
        gfs2_trans_end(sdp);
-
- out_ipres:
-       if (nalloc)
-               gfs2_inplace_release(ip);
-
- out_alloc:
-       if (nalloc)
-               gfs2_alloc_put(ip);
-
- out_gunlock:
+out_ipres:
+       gfs2_inplace_release(ip);
+out_alloc:
+       gfs2_alloc_put(ip);
+out_gunlock:
        gfs2_glock_dq_uninit(&i_gh);
-
- out:
+out:
        while (qx--)
                gfs2_glock_dq_uninit(&ghs[qx]);
        kfree(ghs);
-       gfs2_log_flush_glock(ip->i_gl);
-
+       gfs2_log_flush(ip->i_gl->gl_sbd, ip->i_gl);
        return error;
 }
 
@@ -700,51 +827,50 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
                    struct gfs2_holder *q_gh)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
+       struct gfs2_inode *ip = GFS2_I(sdp->sd_quota_inode);
        struct gfs2_holder i_gh;
-       struct gfs2_quota q;
+       struct gfs2_quota_host q;
        char buf[sizeof(struct gfs2_quota)];
        int error;
+       struct gfs2_quota_lvb *qlvb;
 
- restart:
+restart:
        error = gfs2_glock_nq_init(qd->qd_gl, LM_ST_SHARED, 0, q_gh);
        if (error)
                return error;
 
-       gfs2_quota_lvb_in(&qd->qd_qb, qd->qd_gl->gl_lvb);
+       qd->qd_qb = *(struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb;
 
-       if (force_refresh || qd->qd_qb.qb_magic != GFS2_MAGIC) {
+       if (force_refresh || qd->qd_qb.qb_magic != cpu_to_be32(GFS2_MAGIC)) {
+               loff_t pos;
                gfs2_glock_dq_uninit(q_gh);
                error = gfs2_glock_nq_init(qd->qd_gl,
-                                         LM_ST_EXCLUSIVE, GL_NOCACHE,
-                                         q_gh);
+                                          LM_ST_EXCLUSIVE, GL_NOCACHE,
+                                          q_gh);
                if (error)
                        return error;
 
-               error = gfs2_glock_nq_init(sdp->sd_quota_inode->i_gl,
-                                         LM_ST_SHARED, 0,
-                                         &i_gh);
+               error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
                if (error)
                        goto fail;
 
                memset(buf, 0, sizeof(struct gfs2_quota));
-
-               error = gfs2_jdata_read_mem(sdp->sd_quota_inode, buf,
-                                           qd2offset(qd),
-                                           sizeof(struct gfs2_quota));
+               pos = qd2offset(qd);
+               error = gfs2_internal_read(ip, NULL, buf, &pos,
+                                          sizeof(struct gfs2_quota));
                if (error < 0)
                        goto fail_gunlock;
 
                gfs2_glock_dq_uninit(&i_gh);
 
                gfs2_quota_in(&q, buf);
-
-               memset(&qd->qd_qb, 0, sizeof(struct gfs2_quota_lvb));
-               qd->qd_qb.qb_magic = GFS2_MAGIC;
-               qd->qd_qb.qb_limit = q.qu_limit;
-               qd->qd_qb.qb_warn = q.qu_warn;
-               qd->qd_qb.qb_value = q.qu_value;
-
-               gfs2_quota_lvb_out(&qd->qd_qb, qd->qd_gl->gl_lvb);
+               qlvb = (struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb;
+               qlvb->qb_magic = cpu_to_be32(GFS2_MAGIC);
+               qlvb->__pad = 0;
+               qlvb->qb_limit = cpu_to_be64(q.qu_limit);
+               qlvb->qb_warn = cpu_to_be64(q.qu_warn);
+               qlvb->qb_value = cpu_to_be64(q.qu_value);
+               qd->qd_qb = *qlvb;
 
                if (gfs2_glock_is_blocking(qd->qd_gl)) {
                        gfs2_glock_dq_uninit(q_gh);
@@ -755,19 +881,17 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
 
        return 0;
 
- fail_gunlock:
+fail_gunlock:
        gfs2_glock_dq_uninit(&i_gh);
-
- fail:
+fail:
        gfs2_glock_dq_uninit(q_gh);
-
        return error;
 }
 
-int gfs2_quota_lock(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
+int gfs2_quota_lock(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
-       struct gfs2_sbd *sdp = ip->i_sbd;
-       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+       struct gfs2_alloc *al = ip->i_alloc;
        unsigned int x;
        int error = 0;
 
@@ -801,16 +925,16 @@ static int need_sync(struct gfs2_quota_data *qd)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
        struct gfs2_tune *gt = &sdp->sd_tune;
-       int64_t value;
+       s64 value;
        unsigned int num, den;
        int do_sync = 1;
 
        if (!qd->qd_qb.qb_limit)
                return 0;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
        value = qd->qd_change;
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        spin_lock(&gt->gt_spin);
        num = gt->gt_quota_scale_num;
@@ -819,13 +943,14 @@ static int need_sync(struct gfs2_quota_data *qd)
 
        if (value < 0)
                do_sync = 0;
-       else if (qd->qd_qb.qb_value >= (int64_t)qd->qd_qb.qb_limit)
+       else if ((s64)be64_to_cpu(qd->qd_qb.qb_value) >=
+                (s64)be64_to_cpu(qd->qd_qb.qb_limit))
                do_sync = 0;
        else {
                value *= gfs2_jindex_size(sdp) * num;
-               do_div(value, den);
-               value += qd->qd_qb.qb_value;
-               if (value < (int64_t)qd->qd_qb.qb_limit)
+               value = div_s64(value, den);
+               value += (s64)be64_to_cpu(qd->qd_qb.qb_value);
+               if (value < (s64)be64_to_cpu(qd->qd_qb.qb_limit))
                        do_sync = 0;
        }
 
@@ -834,7 +959,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_alloc *al = ip->i_alloc;
        struct gfs2_quota_data *qda[4];
        unsigned int count = 0;
        unsigned int x;
@@ -861,7 +986,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
                        qd_unlock(qda[x]);
        }
 
- out:
+out:
        gfs2_quota_unhold(ip);
 }
 
@@ -870,34 +995,21 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
 static int print_message(struct gfs2_quota_data *qd, char *type)
 {
        struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-       char *line;
-       int len;
-
-       line = kmalloc(MAX_LINE, GFP_KERNEL);
-       if (!line)
-               return -ENOMEM;
-
-       len = snprintf(line, MAX_LINE-1, "GFS2: fsid=%s: quota %s for %s %u\r\n",
-                      sdp->sd_fsname, type,
-                      (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
-                      qd->qd_id);
-       line[MAX_LINE-1] = 0;
-
-       if (current->signal) { /* Is this test still required? */
-               tty_write_message(current->signal->tty, line);
-       }
 
-       kfree(line);
+       printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\r\n",
+              sdp->sd_fsname, type,
+              (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
+              qd->qd_id);
 
        return 0;
 }
 
-int gfs2_quota_check(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
+int gfs2_quota_check(struct gfs2_inode *ip, u32 uid, u32 gid)
 {
-       struct gfs2_sbd *sdp = ip->i_sbd;
-       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
+       struct gfs2_alloc *al = ip->i_alloc;
        struct gfs2_quota_data *qd;
-       int64_t value;
+       s64 value;
        unsigned int x;
        int error = 0;
 
@@ -914,19 +1026,20 @@ int gfs2_quota_check(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
                      (qd->qd_id == gid && !test_bit(QDF_USER, &qd->qd_flags))))
                        continue;
 
-               value = qd->qd_qb.qb_value;
-               spin_lock(&sdp->sd_quota_spin);
+               value = (s64)be64_to_cpu(qd->qd_qb.qb_value);
+               spin_lock(&qd_lru_lock);
                value += qd->qd_change;
-               spin_unlock(&sdp->sd_quota_spin);
+               spin_unlock(&qd_lru_lock);
 
-               if (qd->qd_qb.qb_limit && (int64_t)qd->qd_qb.qb_limit < value) {
+               if (be64_to_cpu(qd->qd_qb.qb_limit) && (s64)be64_to_cpu(qd->qd_qb.qb_limit) < value) {
                        print_message(qd, "exceeded");
                        error = -EDQUOT;
                        break;
-               } else if (qd->qd_qb.qb_warn &&
-                          (int64_t)qd->qd_qb.qb_warn < value &&
+               } else if (be64_to_cpu(qd->qd_qb.qb_warn) &&
+                          (s64)be64_to_cpu(qd->qd_qb.qb_warn) < value &&
                           time_after_eq(jiffies, qd->qd_last_warn +
-                                        gfs2_tune_get(sdp, gt_quota_warn_period) * HZ)) {
+                                        gfs2_tune_get(sdp,
+                                               gt_quota_warn_period) * HZ)) {
                        error = print_message(qd, "warning");
                        qd->qd_last_warn = jiffies;
                }
@@ -935,17 +1048,16 @@ int gfs2_quota_check(struct gfs2_inode *ip, uint32_t uid, uint32_t gid)
        return error;
 }
 
-void gfs2_quota_change(struct gfs2_inode *ip, int64_t change,
-                      uint32_t uid, uint32_t gid)
+void gfs2_quota_change(struct gfs2_inode *ip, s64 change,
+                      u32 uid, u32 gid)
 {
-       struct gfs2_alloc *al = &ip->i_alloc;
+       struct gfs2_alloc *al = ip->i_alloc;
        struct gfs2_quota_data *qd;
        unsigned int x;
-       unsigned int found = 0;
 
-       if (gfs2_assert_warn(ip->i_sbd, change))
+       if (gfs2_assert_warn(GFS2_SB(&ip->i_inode), change))
                return;
-       if (ip->i_di.di_flags & GFS2_DIF_SYSTEM)
+       if (ip->i_diskflags & GFS2_DIF_SYSTEM)
                return;
 
        for (x = 0; x < al->al_qd_num; x++) {
@@ -954,7 +1066,6 @@ void gfs2_quota_change(struct gfs2_inode *ip, int64_t change,
                if ((qd->qd_id == uid && test_bit(QDF_USER, &qd->qd_flags)) ||
                    (qd->qd_id == gid && !test_bit(QDF_USER, &qd->qd_flags))) {
                        do_qc(qd, change);
-                       found++;
                }
        }
 }
@@ -1002,7 +1113,7 @@ int gfs2_quota_sync(struct gfs2_sbd *sdp)
        return error;
 }
 
-int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, uint32_t id)
+int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, u32 id)
 {
        struct gfs2_quota_data *qd;
        struct gfs2_holder q_gh;
@@ -1021,70 +1132,42 @@ int gfs2_quota_refresh(struct gfs2_sbd *sdp, int user, uint32_t id)
        return error;
 }
 
-int gfs2_quota_read(struct gfs2_sbd *sdp, int user, uint32_t id,
-                   struct gfs2_quota *q)
+static void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf)
 {
-       struct gfs2_quota_data *qd;
-       struct gfs2_holder q_gh;
-       int error;
-
-       if (((user) ? (id != current->fsuid) : (!in_group_p(id))) &&
-           !capable(CAP_SYS_ADMIN))
-               return -EACCES;
-
-       error = qd_get(sdp, user, id, CREATE, &qd);
-       if (error)
-               return error;
+       const struct gfs2_quota_change *str = buf;
 
-       error = do_glock(qd, NO_FORCE, &q_gh);
-       if (error)
-               goto out;
-
-       memset(q, 0, sizeof(struct gfs2_quota));
-       q->qu_limit = qd->qd_qb.qb_limit;
-       q->qu_warn = qd->qd_qb.qb_warn;
-       q->qu_value = qd->qd_qb.qb_value;
-
-       spin_lock(&sdp->sd_quota_spin);
-       q->qu_value += qd->qd_change;
-       spin_unlock(&sdp->sd_quota_spin);
-
-       gfs2_glock_dq_uninit(&q_gh);
-
- out:
-       qd_put(qd);
-
-       return error;
+       qc->qc_change = be64_to_cpu(str->qc_change);
+       qc->qc_flags = be32_to_cpu(str->qc_flags);
+       qc->qc_id = be32_to_cpu(str->qc_id);
 }
 
 int gfs2_quota_init(struct gfs2_sbd *sdp)
 {
-       struct gfs2_inode *ip = sdp->sd_qc_inode;
-       unsigned int blocks = ip->i_di.di_size >> sdp->sd_sb.sb_bsize_shift;
+       struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode);
+       unsigned int blocks = ip->i_disksize >> sdp->sd_sb.sb_bsize_shift;
        unsigned int x, slot = 0;
        unsigned int found = 0;
-       uint64_t dblock;
-       uint32_t extlen = 0;
+       u64 dblock;
+       u32 extlen = 0;
        int error;
 
-       if (!ip->i_di.di_size ||
-           ip->i_di.di_size > (64 << 20) ||
-           ip->i_di.di_size & (sdp->sd_sb.sb_bsize - 1)) {
+       if (!ip->i_disksize || ip->i_disksize > (64 << 20) ||
+           ip->i_disksize & (sdp->sd_sb.sb_bsize - 1)) {
                gfs2_consist_inode(ip);
-               return -EIO;            
+               return -EIO;
        }
        sdp->sd_quota_slots = blocks * sdp->sd_qc_per_block;
-       sdp->sd_quota_chunks = DIV_RU(sdp->sd_quota_slots, 8 * PAGE_SIZE);
+       sdp->sd_quota_chunks = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * PAGE_SIZE);
 
        error = -ENOMEM;
 
        sdp->sd_quota_bitmap = kcalloc(sdp->sd_quota_chunks,
-                                      sizeof(unsigned char *), GFP_KERNEL);
+                                      sizeof(unsigned char *), GFP_NOFS);
        if (!sdp->sd_quota_bitmap)
                return error;
 
        for (x = 0; x < sdp->sd_quota_chunks; x++) {
-               sdp->sd_quota_bitmap[x] = kzalloc(PAGE_SIZE, GFP_KERNEL);
+               sdp->sd_quota_bitmap[x] = kzalloc(PAGE_SIZE, GFP_NOFS);
                if (!sdp->sd_quota_bitmap[x])
                        goto fail;
        }
@@ -1095,25 +1178,22 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
 
                if (!extlen) {
                        int new = 0;
-                       error = gfs2_block_map(ip, x, &new, &dblock, &extlen);
+                       error = gfs2_extent_map(&ip->i_inode, x, &new, &dblock, &extlen);
                        if (error)
                                goto fail;
                }
-               gfs2_meta_ra(ip->i_gl,  dblock, extlen);
-               error = gfs2_meta_read(ip->i_gl, dblock, DIO_START | DIO_WAIT,
-                                      &bh);
-               if (error)
-                       goto fail;
                error = -EIO;
+               bh = gfs2_meta_ra(ip->i_gl, dblock, extlen);
+               if (!bh)
+                       goto fail;
                if (gfs2_metatype_check(sdp, bh, GFS2_METATYPE_QC)) {
                        brelse(bh);
                        goto fail;
                }
 
-               for (y = 0;
-                    y < sdp->sd_qc_per_block && slot < sdp->sd_quota_slots;
+               for (y = 0; y < sdp->sd_qc_per_block && slot < sdp->sd_quota_slots;
                     y++, slot++) {
-                       struct gfs2_quota_change qc;
+                       struct gfs2_quota_change_host qc;
                        struct gfs2_quota_data *qd;
 
                        gfs2_quota_change_in(&qc, bh->b_data +
@@ -1133,13 +1213,12 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
                        qd->qd_change = qc.qc_change;
                        qd->qd_slot = slot;
                        qd->qd_slot_count = 1;
-                       qd->qd_last_touched = jiffies;
 
-                       spin_lock(&sdp->sd_quota_spin);
+                       spin_lock(&qd_lru_lock);
                        gfs2_icbit_munge(sdp, sdp->sd_quota_bitmap, slot, 1);
                        list_add(&qd->qd_list, &sdp->sd_quota_list);
                        atomic_inc(&sdp->sd_quota_count);
-                       spin_unlock(&sdp->sd_quota_spin);
+                       spin_unlock(&qd_lru_lock);
 
                        found++;
                }
@@ -1154,78 +1233,53 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
 
        return 0;
 
- fail:
+fail:
        gfs2_quota_cleanup(sdp);
        return error;
 }
 
-void gfs2_quota_scan(struct gfs2_sbd *sdp)
-{
-       struct gfs2_quota_data *qd, *safe;
-       LIST_HEAD(dead);
-
-       spin_lock(&sdp->sd_quota_spin);
-       list_for_each_entry_safe(qd, safe, &sdp->sd_quota_list, qd_list) {
-               if (!qd->qd_count &&
-                   time_after_eq(jiffies, qd->qd_last_touched +
-                               gfs2_tune_get(sdp, gt_quota_cache_secs) * HZ)) {
-                       list_move(&qd->qd_list, &dead);
-                       gfs2_assert_warn(sdp,
-                                        atomic_read(&sdp->sd_quota_count) > 0);
-                       atomic_dec(&sdp->sd_quota_count);
-               }
-       }
-       spin_unlock(&sdp->sd_quota_spin);
-
-       while (!list_empty(&dead)) {
-               qd = list_entry(dead.next, struct gfs2_quota_data, qd_list);
-               list_del(&qd->qd_list);
-
-               gfs2_assert_warn(sdp, !qd->qd_change);
-               gfs2_assert_warn(sdp, !qd->qd_slot_count);
-               gfs2_assert_warn(sdp, !qd->qd_bh_count);
-
-               gfs2_lvb_unhold(qd->qd_gl);
-               kfree(qd);
-       }
-}
-
 void gfs2_quota_cleanup(struct gfs2_sbd *sdp)
 {
        struct list_head *head = &sdp->sd_quota_list;
        struct gfs2_quota_data *qd;
        unsigned int x;
 
-       spin_lock(&sdp->sd_quota_spin);
+       spin_lock(&qd_lru_lock);
        while (!list_empty(head)) {
                qd = list_entry(head->prev, struct gfs2_quota_data, qd_list);
 
-               if (qd->qd_count > 1 ||
-                   (qd->qd_count && !test_bit(QDF_CHANGE, &qd->qd_flags))) {
+               if (atomic_read(&qd->qd_count) > 1 ||
+                   (atomic_read(&qd->qd_count) &&
+                    !test_bit(QDF_CHANGE, &qd->qd_flags))) {
                        list_move(&qd->qd_list, head);
-                       spin_unlock(&sdp->sd_quota_spin);
+                       spin_unlock(&qd_lru_lock);
                        schedule();
-                       spin_lock(&sdp->sd_quota_spin);
+                       spin_lock(&qd_lru_lock);
                        continue;
                }
 
                list_del(&qd->qd_list);
+               /* Also remove if this qd exists in the reclaim list */
+               if (!list_empty(&qd->qd_reclaim)) {
+                       list_del_init(&qd->qd_reclaim);
+                       atomic_dec(&qd_lru_count);
+               }
                atomic_dec(&sdp->sd_quota_count);
-               spin_unlock(&sdp->sd_quota_spin);
+               spin_unlock(&qd_lru_lock);
 
-               if (!qd->qd_count) {
+               if (!atomic_read(&qd->qd_count)) {
                        gfs2_assert_warn(sdp, !qd->qd_change);
                        gfs2_assert_warn(sdp, !qd->qd_slot_count);
                } else
                        gfs2_assert_warn(sdp, qd->qd_slot_count == 1);
                gfs2_assert_warn(sdp, !qd->qd_bh_count);
 
-               gfs2_lvb_unhold(qd->qd_gl);
-               kfree(qd);
+               gfs2_glock_put(qd->qd_gl);
+               kmem_cache_free(gfs2_quotad_cachep, qd);
 
-               spin_lock(&sdp->sd_quota_spin);
+               spin_lock(&qd_lru_lock);
        }
-       spin_unlock(&sdp->sd_quota_spin);
+       spin_unlock(&qd_lru_lock);
 
        gfs2_assert_warn(sdp, !atomic_read(&sdp->sd_quota_count));
 
@@ -1236,3 +1290,91 @@ void gfs2_quota_cleanup(struct gfs2_sbd *sdp)
        }
 }
 
+static void quotad_error(struct gfs2_sbd *sdp, const char *msg, int error)
+{
+       if (error == 0 || error == -EROFS)
+               return;
+       if (!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))
+               fs_err(sdp, "gfs2_quotad: %s error %d\n", msg, error);
+}
+
+static void quotad_check_timeo(struct gfs2_sbd *sdp, const char *msg,
+                              int (*fxn)(struct gfs2_sbd *sdp),
+                              unsigned long t, unsigned long *timeo,
+                              unsigned int *new_timeo)
+{
+       if (t >= *timeo) {
+               int error = fxn(sdp);
+               quotad_error(sdp, msg, error);
+               *timeo = gfs2_tune_get_i(&sdp->sd_tune, new_timeo) * HZ;
+       } else {
+               *timeo -= t;
+       }
+}
+
+static void quotad_check_trunc_list(struct gfs2_sbd *sdp)
+{
+       struct gfs2_inode *ip;
+
+       while(1) {
+               ip = NULL;
+               spin_lock(&sdp->sd_trunc_lock);
+               if (!list_empty(&sdp->sd_trunc_list)) {
+                       ip = list_entry(sdp->sd_trunc_list.next,
+                                       struct gfs2_inode, i_trunc_list);
+                       list_del_init(&ip->i_trunc_list);
+               }
+               spin_unlock(&sdp->sd_trunc_lock);
+               if (ip == NULL)
+                       return;
+               gfs2_glock_finish_truncate(ip);
+       }
+}
+
+/**
+ * gfs2_quotad - Write cached quota changes into the quota file
+ * @sdp: Pointer to GFS2 superblock
+ *
+ */
+
+int gfs2_quotad(void *data)
+{
+       struct gfs2_sbd *sdp = data;
+       struct gfs2_tune *tune = &sdp->sd_tune;
+       unsigned long statfs_timeo = 0;
+       unsigned long quotad_timeo = 0;
+       unsigned long t = 0;
+       DEFINE_WAIT(wait);
+       int empty;
+
+       while (!kthread_should_stop()) {
+
+               /* Update the master statfs file */
+               quotad_check_timeo(sdp, "statfs", gfs2_statfs_sync, t,
+                                  &statfs_timeo, &tune->gt_statfs_quantum);
+
+               /* Update quota file */
+               quotad_check_timeo(sdp, "sync", gfs2_quota_sync, t,
+                                  &quotad_timeo, &tune->gt_quota_quantum);
+
+               /* Check for & recover partially truncated inodes */
+               quotad_check_trunc_list(sdp);
+
+               if (freezing(current))
+                       refrigerator();
+               t = min(quotad_timeo, statfs_timeo);
+
+               prepare_to_wait(&sdp->sd_quota_wait, &wait, TASK_INTERRUPTIBLE);
+               spin_lock(&sdp->sd_trunc_lock);
+               empty = list_empty(&sdp->sd_trunc_list);
+               spin_unlock(&sdp->sd_trunc_lock);
+               if (empty)
+                       t -= schedule_timeout(t);
+               else
+                       t = 0;
+               finish_wait(&sdp->sd_quota_wait, &wait);
+       }
+
+       return 0;
+}
+