tags 644502 +pending
thanks
On Thu, Oct 06, 2011 at 02:37:41PM +0200, Svante Signell wrote:
>
> The patch inlined below fixes the remaining FTBFS problems for
> GNU/Hurd.
>
> It probably fixes the build problems for GNU/kFreeBSD too. The QIF_*
> stuff is only used for quota_v2 and kfree seems to have version quota_v1
> as their quota.h does not have these defined. For kfreebsd-* quota.h is
> at ufs/ not sys/ so the test below also applies to this architecture.
> From the latest build log quotactl is found, and that function is
> defined in quota.h.
Thanks, I already have the following checked into the git tree to
address that problem (which I had noticed by checking the buildd logs).
I'm waiting for clarification from the mips folks about how to address
the remaining MIPS build failure before uploading a new updated package...
It's good to know that this fixes the last remaining problem with
Hurd. BTW, could you confirm that on a hurd system the mke2fs.conf
file which is included has a default inode_size of 128 bytes, to
address #629355? Thanks!!
- Ted
commit b5ba6f5b9da9d4e3d6f52ef9470ec12a161b1a7f
Author: Theodore Ts'o <[email protected]>
Date: Wed Oct 5 13:26:59 2011 -0400
libquota: remove flag argument to commit_dquot()
The flag parameter wasn't being used, and using it meant that we had
to define the COMMIT_* flags, which relied on the QIF_* flags being
present. Removing this allows for increased portability.
Signed-off-by: "Theodore Ts'o" <[email protected]>
diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
index 35cac66..5440003 100644
--- a/lib/quota/mkquota.c
+++ b/lib/quota/mkquota.c
@@ -127,7 +127,7 @@ static void write_dquots(dict_t *dict, struct quota_handle
*qh)
if (dq) {
dq->dq_h = qh;
update_grace_times(dq);
- qh->qh_ops->commit_dquot(dq, COMMIT_ALL);
+ qh->qh_ops->commit_dquot(dq);
}
}
}
diff --git a/lib/quota/quotaio.h b/lib/quota/quotaio.h
index 333a59f..282b543 100644
--- a/lib/quota/quotaio.h
+++ b/lib/quota/quotaio.h
@@ -101,13 +101,6 @@ struct dquot {
struct util_dqblk dq_dqb; /* Parsed data of dquot */
};
-/* Flags for commit function (have effect only when quota in kernel is
- * turned on) */
-#define COMMIT_USAGE QIF_USAGE
-#define COMMIT_LIMITS QIF_LIMITS
-#define COMMIT_TIMES QIF_TIMES
-#define COMMIT_ALL (COMMIT_USAGE | COMMIT_LIMITS | COMMIT_TIMES)
-
/* Structure of quotafile operations */
struct quotafile_ops {
/* Check whether quotafile is in our format */
@@ -123,7 +116,7 @@ struct quotafile_ops {
/* Read dquot into memory */
struct dquot *(*read_dquot) (struct quota_handle *h, qid_t id);
/* Write given dquot to disk */
- int (*commit_dquot) (struct dquot *dquot, int flag);
+ int (*commit_dquot) (struct dquot *dquot);
/* Scan quotafile and call callback on every structure */
int (*scan_dquots) (struct quota_handle *h,
int (*process_dquot) (struct dquot *dquot,
diff --git a/lib/quota/quotaio_v2.c b/lib/quota/quotaio_v2.c
index 35512c0..7c9e4f7 100644
--- a/lib/quota/quotaio_v2.c
+++ b/lib/quota/quotaio_v2.c
@@ -25,7 +25,7 @@ static int v2_init_io(struct quota_handle *h);
static int v2_new_io(struct quota_handle *h);
static int v2_write_info(struct quota_handle *h);
static struct dquot *v2_read_dquot(struct quota_handle *h, qid_t id);
-static int v2_commit_dquot(struct dquot *dquot, int flags);
+static int v2_commit_dquot(struct dquot *dquot);
static int v2_scan_dquots(struct quota_handle *h,
int (*process_dquot) (struct dquot *dquot,
char *dqname));
@@ -285,7 +285,7 @@ static struct dquot *v2_read_dquot(struct quota_handle *h,
qid_t id)
* became fake one and user has no blocks.
* User can process use 'errno' to detect errstr.
*/
-static int v2_commit_dquot(struct dquot *dquot, int flags)
+static int v2_commit_dquot(struct dquot *dquot)
{
struct util_dqblk *b = &dquot->dq_dqb;
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
