Commit 7aed98fb authored by Steven Whitehouse's avatar Steven Whitehouse

GFS2: Remove gfs2_quota_change_host structure

There is only one place this is used, when reading in the quota
changes at mount time. It is not really required and much
simpler to just convert the fields from the on-disk structure
as required.

There should be no functional change as a result of this patch.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent e4f29206
...@@ -67,12 +67,6 @@ ...@@ -67,12 +67,6 @@
#include "inode.h" #include "inode.h"
#include "util.h" #include "util.h"
struct gfs2_quota_change_host {
u64 qc_change;
u32 qc_flags; /* GFS2_QCF_... */
struct kqid qc_id;
};
/* Lock order: qd_lock -> qd->lockref.lock -> lru lock */ /* Lock order: qd_lock -> qd->lockref.lock -> lru lock */
static DEFINE_SPINLOCK(qd_lock); static DEFINE_SPINLOCK(qd_lock);
struct list_lru gfs2_qd_lru; struct list_lru gfs2_qd_lru;
...@@ -1214,17 +1208,6 @@ int gfs2_quota_refresh(struct gfs2_sbd *sdp, struct kqid qid) ...@@ -1214,17 +1208,6 @@ int gfs2_quota_refresh(struct gfs2_sbd *sdp, struct kqid qid)
return error; return error;
} }
static void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf)
{
const struct gfs2_quota_change *str = buf;
qc->qc_change = be64_to_cpu(str->qc_change);
qc->qc_flags = be32_to_cpu(str->qc_flags);
qc->qc_id = make_kqid(&init_user_ns,
(qc->qc_flags & GFS2_QCF_USER)?USRQUOTA:GRPQUOTA,
be32_to_cpu(str->qc_id));
}
int gfs2_quota_init(struct gfs2_sbd *sdp) int gfs2_quota_init(struct gfs2_sbd *sdp)
{ {
struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode); struct gfs2_inode *ip = GFS2_I(sdp->sd_qc_inode);
...@@ -1257,6 +1240,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) ...@@ -1257,6 +1240,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
for (x = 0; x < blocks; x++) { for (x = 0; x < blocks; x++) {
struct buffer_head *bh; struct buffer_head *bh;
const struct gfs2_quota_change *qc;
unsigned int y; unsigned int y;
if (!extlen) { if (!extlen) {
...@@ -1274,25 +1258,28 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) ...@@ -1274,25 +1258,28 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
goto fail; goto fail;
} }
qc = (const struct gfs2_quota_change *)(bh->b_data + sizeof(struct gfs2_meta_header));
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++) { y++, slot++) {
struct gfs2_quota_change_host qc;
struct gfs2_quota_data *qd; struct gfs2_quota_data *qd;
s64 qc_change = be64_to_cpu(qc->qc_change);
gfs2_quota_change_in(&qc, bh->b_data + u32 qc_flags = be32_to_cpu(qc->qc_flags);
sizeof(struct gfs2_meta_header) + enum quota_type qtype = (qc_flags & GFS2_QCF_USER) ?
y * sizeof(struct gfs2_quota_change)); USRQUOTA : GRPQUOTA;
if (!qc.qc_change) struct kqid qc_id = make_kqid(&init_user_ns, qtype,
be32_to_cpu(qc->qc_id));
qc++;
if (!qc_change)
continue; continue;
error = qd_alloc(sdp, qc.qc_id, &qd); error = qd_alloc(sdp, qc_id, &qd);
if (error) { if (error) {
brelse(bh); brelse(bh);
goto fail; goto fail;
} }
set_bit(QDF_CHANGE, &qd->qd_flags); set_bit(QDF_CHANGE, &qd->qd_flags);
qd->qd_change = qc.qc_change; qd->qd_change = qc_change;
qd->qd_slot = slot; qd->qd_slot = slot;
qd->qd_slot_count = 1; qd->qd_slot_count = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment