Hi Julien Cc'ing Michael (maintainer of quota).
On Sat, Dec 01, 2012 at 01:05:29PM +0100, Julien Cristau wrote: [...] > Would it be possible to get *only* the xfs fix in testing instead of the > whole new release? I was looking at the bugs for release.debian.org for the wheezy release and noticed #688321. I cherry picked the mentioned patch and rebuilded the package. repquota now reports the quotas even on Fileystems are files owned by users without quota. Attached is the proposed debdiff. Would that be acceptable Julien? (strictly speaking if the bug is not RC, then it does not meet the criterias mentioned in freeze policy as it cannot go trough unstable). Michael, would you like to follow-up on this yourself? Regards, Salvatore
diff -u quota-4.00/debian/changelog quota-4.00/debian/changelog
--- quota-4.00/debian/changelog
+++ quota-4.00/debian/changelog
@@ -1,3 +1,12 @@
+quota (4.00-4+deb7u1) testing-proposed-updates; urgency=low
+
+ * Non-maintainer upload.
+ * Add 685356-Fix-reporting-for-XFS.patch patch.
+ Fixes quota reporting on XFS filesystems. Cherry-pick commit from
+ upstream git repository. (Closes: #685356)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Thu, 27 Dec 2012 07:03:36 +0100
+
quota (4.00-4) unstable; urgency=low
* Added upstream patch to fix problem with editing of several users.
diff -u quota-4.00/debian/patches/series quota-4.00/debian/patches/series
--- quota-4.00/debian/patches/series
+++ quota-4.00/debian/patches/series
@@ -4,0 +5 @@
+685356-Fix-reporting-for-XFS.patch
only in patch2:
unchanged:
--- quota-4.00.orig/debian/patches/685356-Fix-reporting-for-XFS.patch
+++ quota-4.00/debian/patches/685356-Fix-reporting-for-XFS.patch
@@ -0,0 +1,35 @@
+From 6ba6546dd167297cb9ed69d0257ee245b0faea47 Mon Sep 17 00:00:00 2001
+From: Jan Kara <j...@suse.cz>
+Date: Fri, 8 Jun 2012 11:11:20 +0200
+Subject: [PATCH] repquota: Fix reporting for XFS
+
+Conversion to generic quota scanning introduced a bug for XFS where we
+stopped scanning after quotactl reported first error. quotactl for XFS
+however reports ENOENT when it has nothing to report for a particular user
+/ group and we shouldn't stop scanning after that. We tried to test for this
+but the test was wrong. Fix it.
+
+Signed-off-by: Jan Kara <j...@suse.cz>
+---
+ quotaio_xfs.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/quotaio_xfs.c b/quotaio_xfs.c
+index 2e879e6..903c03e 100644
+--- a/quotaio_xfs.c
++++ b/quotaio_xfs.c
+@@ -183,9 +183,9 @@ static int xfs_get_dquot(struct dquot *dq)
+ memset(&d, 0, sizeof(d));
+ ret = quotactl(qcmd, dq->dq_h->qh_quotadev, dq->dq_id, (void *)&d);
+ if (ret < 0) {
+- if (ret == -ENOENT)
++ if (errno == ENOENT)
+ return 0;
+- return ret;
++ return -1;
+ }
+ xfs_kern2utildqblk(&dq->dq_dqb, &d);
+ return 0;
+--
+1.7.4.1
+
signature.asc
Description: Digital signature
