1 files changed, 34 insertions, 2 deletions

diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
index 7795e0d01382..f82d79a8c694 100644
--- a/fs/xfs/xfs_quotaops.c
+++ b/fs/xfs/xfs_quotaops.c
@@ -231,14 +231,45 @@ xfs_fs_get_dqblk(
         struct qc_dqblk         *qdq)
 {
         struct xfs_mount        *mp = XFS_M(sb);
+        xfs_dqid_t              id;
 
         if (!XFS_IS_QUOTA_RUNNING(mp))
                 return -ENOSYS;
         if (!XFS_IS_QUOTA_ON(mp))
                 return -ESRCH;
 
-        return xfs_qm_scall_getquota(mp, from_kqid(&init_user_ns, qid),
-                                      xfs_quota_type(qid.type), qdq);
+        id = from_kqid(&init_user_ns, qid);
+        return xfs_qm_scall_getquota(mp, &id,
+                                      xfs_quota_type(qid.type), qdq, 0);
+}
+
+/* Return quota info for active quota >= this qid */
+STATIC int
+xfs_fs_get_nextdqblk(
+        struct super_block      *sb,
+        struct kqid             *qid,
+        struct qc_dqblk         *qdq)
+{
+        int                     ret;
+        struct xfs_mount        *mp = XFS_M(sb);
+        xfs_dqid_t              id;
+
+        if (!XFS_IS_QUOTA_RUNNING(mp))
+                return -ENOSYS;
+        if (!XFS_IS_QUOTA_ON(mp))
+                return -ESRCH;
+
+        id = from_kqid(&init_user_ns, *qid);
+        ret = xfs_qm_scall_getquota(mp, &id,
+                                    xfs_quota_type(qid->type), qdq,
+                                    XFS_QMOPT_DQNEXT);
+        if (ret)
+                return ret;
+
+        /* ID may be different, so convert back what we got */
+        *qid = make_kqid(current_user_ns(), qid->type, id);
+        return 0;
+        
 }
 
 STATIC int
@@ -267,5 +298,6 @@ const struct quotactl_ops xfs_quotactl_operations = {
         .quota_disable          = xfs_quota_disable,
         .rm_xquota              = xfs_fs_rm_xquota,
         .get_dqblk              = xfs_fs_get_dqblk,
+        .get_nextdqblk          = xfs_fs_get_nextdqblk,
         .set_dqblk              = xfs_fs_set_dqblk,
 };