apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

src/test-nextquota: fix build failure with glibc 2.24

Browse Source 
glibc 2.24 defines Q_GETNEXTQUOTA but not `struct nextdqblk`. We
need to define it ourselves, but let's give it a hacky name that
won't cause another build error when the definition is added to
glibc.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Omar Sandoval
2016-08-16 17:18:28 -07:00
committed by Eryu Guan
parent 397c6eb2b6
commit 2a084ec451
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test-nextquota.c
+5 -4
View File
@@ -40,8 +40,10 @@
#ifndef Q_GETNEXTQUOTA
#define Q_GETNEXTQUOTA 0x800009 /* get disk limits and usage >= ID */
#endif
struct nextdqblk
/* glibc 2.24 defines Q_GETNEXTQUOTA but not struct nextdqblk. */
struct test_nextdqblk
{
u_int64_t dqb_bhardlimit; /* absolute limit on disk quota blocks alloc */
u_int64_t dqb_bsoftlimit; /* preferred limit on disk quota blocks */
@@ -54,7 +56,6 @@ struct nextdqblk
u_int32_t dqb_valid; /* bitmask of QIF_* constants */
u_int32_t dqb_id; /* id for this quota info*/
};
#endif
#ifndef Q_XGETNEXTQUOTA
#define Q_XGETNEXTQUOTA XQM_CMD(9)
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
uint id = 0, idflag = 0;
char *device = NULL;
char *tmp;
struct nextdqblk dqb;
struct test_nextdqblk dqb;
struct fs_disk_quota xqb;
while ((c = getopt(argc,argv,"ugpi:d:v")) != EOF) {
@@ -131,7 +132,7 @@ int main(int argc, char *argv[])
if (verbose)
printf("asking for quota type %d for id %u on %s\n", type, id, device);
memset(&dqb, 0, sizeof(struct nextdqblk));
memset(&dqb, 0, sizeof(struct test_nextdqblk));
memset(&xqb, 0, sizeof(struct fs_disk_quota));
if (verbose)