1 files changed, 7 insertions, 7 deletions

diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 0f10ee9892ce..35df08ee9c97 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -211,7 +211,7 @@ static int quota_getquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->get_dqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         ret = sb->s_qcop->get_dqblk(sb, qid, &fdq);
         if (ret)
@@ -237,7 +237,7 @@ static int quota_getnextquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->get_nextdqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         ret = sb->s_qcop->get_nextdqblk(sb, &qid, &fdq);
         if (ret)
@@ -288,7 +288,7 @@ static int quota_setquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->set_dqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         copy_from_if_dqblk(&fdq, &idq);
         return sb->s_qcop->set_dqblk(sb, qid, &fdq);
@@ -581,10 +581,10 @@ static int quota_setxquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->set_dqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         /* Are we actually setting timer / warning limits for all users? */
-        if (from_kqid(&init_user_ns, qid) == 0 &&
+        if (from_kqid(sb->s_user_ns, qid) == 0 &&
             fdq.d_fieldmask & (FS_DQ_WARNS_MASK | FS_DQ_TIMER_MASK)) {
                 struct qc_info qinfo;
                 int ret;
@@ -642,7 +642,7 @@ static int quota_getxquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->get_dqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         ret = sb->s_qcop->get_dqblk(sb, qid, &qdq);
         if (ret)
@@ -669,7 +669,7 @@ static int quota_getnextxquota(struct super_block *sb, int type, qid_t id,
         if (!sb->s_qcop->get_nextdqblk)
                 return -ENOSYS;
         qid = make_kqid(current_user_ns(), type, id);
-        if (!qid_valid(qid))
+        if (!qid_has_mapping(sb->s_user_ns, qid))
                 return -EINVAL;
         ret = sb->s_qcop->get_nextdqblk(sb, &qid, &qdq);
         if (ret)