summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2013-01-31 19:25:50 -0800
committerEric W. Biederman <ebiederm@xmission.com>2013-02-13 06:15:04 -0800
commite08d8d7f201dc1e64f5d9d5aa2cd4f37aecaaab4 (patch)
treeb621e295d481d2f22b5095364a50125f0d388c98 /fs
parent2f6c9896f71e6b6c1c565ea76dd9f5e89579c120 (diff)
downloadop-kernel-dev-e08d8d7f201dc1e64f5d9d5aa2cd4f37aecaaab4.zip
op-kernel-dev-e08d8d7f201dc1e64f5d9d5aa2cd4f37aecaaab4.tar.gz
gfs2: Modify struct gfs2_quota_change_host to use struct kqid
Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/quota.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 0e7c982..02913e9 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -71,7 +71,7 @@
struct gfs2_quota_change_host {
u64 qc_change;
u32 qc_flags; /* GFS2_QCF_... */
- u32 qc_id;
+ struct kqid qc_id;
};
static LIST_HEAD(qd_lru_list);
@@ -1200,7 +1200,9 @@ static void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *
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);
+ 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)
@@ -1264,7 +1266,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp)
continue;
error = qd_alloc(sdp, (qc.qc_flags & GFS2_QCF_USER),
- qc.qc_id, &qd);
+ from_kqid(&init_user_ns, qc.qc_id), &qd);
if (error) {
brelse(bh);
goto fail;
OpenPOWER on IntegriCloud