From ffd30bc3be5683bb7a2d46c51e929edf5f0db573 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 31 Jan 2013 19:25:50 -0800
Subject: [PATCH] --- yaml --- r: 357791 b: refs/heads/master c:
 e08d8d7f201dc1e64f5d9d5aa2cd4f37aecaaab4 h: refs/heads/master i:   357789:
 fc79b61562f174f68d3ba71641a56997488b0fa3   357787:
 672883d6e6570736a86cce7a179add029b2f733b   357783:
 7efdda74033b9f3a199b90f69212732058fb250a   357775:
 9e6770cb4ee553ae91ab4bbc5e584f30dfba073a   357759:
 972f29565b3ce3cbc13732276db3e5d8a7f8a16f v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/quota.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 36f3d7ccdc2d..510acac05ed6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f6c9896f71e6b6c1c565ea76dd9f5e89579c120
+refs/heads/master: e08d8d7f201dc1e64f5d9d5aa2cd4f37aecaaab4
diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index 0e7c982377a1..02913e95491c 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/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;