Hi all
I have updated the proposed debdiff with also the patch for reporting
problem with NFS mounts. Julien is this acceptable for a t-p-u upload?
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,15 @@
+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)
+ * Add 698864-Fix-reporting-of-NFS-mountpoints.patch patch.
+ Fixes quota reporting on NFS mountpoints. Cherry-pick commit from
+ upstream git repository. (Closes: #698864)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Sat, 09 Mar 2013 16:37:03 +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,2 @@
+685356-Fix-reporting-for-XFS.patch
+698864-Fix-reporting-of-NFS-mountpoints.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
+
only in patch2:
unchanged:
--- quota-4.00.orig/debian/patches/698864-Fix-reporting-of-NFS-mountpoints.patch
+++ quota-4.00/debian/patches/698864-Fix-reporting-of-NFS-mountpoints.patch
@@ -0,0 +1,30 @@
+From 8b6ce13e1b196cb9d0cc5b24dfc75c97a9eb883d Mon Sep 17 00:00:00 2001
+From: Jan Kara <j...@suse.cz>
+Date: Mon, 20 Aug 2012 19:16:05 +0200
+Subject: [PATCH] quota: Fix reporting of NFS mountpoints
+
+Commit b8ab76ad19e3c284ac14bd0450662bfc41719e03 creating split_nfs_mount()
+forgot to remove zeroing of pathname character. That lead to broken reporting
+quotas for NFSv3 mount points.
+
+Thanks to anonymous reporter for spotting this.
+
+Signed-off-by: Jan Kara <j...@suse.cz>
+---
+ rquota_client.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/rquota_client.c b/rquota_client.c
+index 54a8921..e26e066 100644
+--- a/rquota_client.c
++++ b/rquota_client.c
+@@ -162,7 +162,6 @@
+ return -ENOENT;
+ }
+
+- *pathname++ = '\0';
+ /* For NFSv4, we send the filesystem path without initial /. Server
prepends proper
+ * NFS pseudoroot automatically and uses this for detection of NFSv4
mounts. */
+ if ((dquot->dq_h->qh_io_flags & IOFL_NFS_MIXED_PATHS) &&
+--
+1.7.4.1
