[lxc-devel] [lxd/master] lxd/storage/quota: guard quota defs for compiling

[joelhockey on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 353 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190505/f7612d0a/attachment.bin>
-------------- next part --------------
From 4f9c0c8334b88e8051caf506600f884691f8a1a0 Mon Sep 17 00:00:00 2001
From: Joel Hockey <joelhockey at chromium.org>
Date: Sun, 5 May 2019 16:53:20 -0700
Subject: [PATCH] lxd/storage/quota: guard quota defs for compiling

Signed-off-by: Joel Hockey <joelhockey at chromium.org>
---
 lxd/storage/quota/projectquota.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lxd/storage/quota/projectquota.go b/lxd/storage/quota/projectquota.go
index 37e4480665..e7e44946ae 100644
--- a/lxd/storage/quota/projectquota.go
+++ b/lxd/storage/quota/projectquota.go
@@ -30,7 +30,10 @@ struct fsxattr {
 	__u32		fsx_projid;
 	unsigned char	fsx_pad[12];
 };
+#define FS_XFLAG_PROJINHERIT 0x00000200
+#endif
 
+#ifndef QIF_DQBLKSIZE_BITS
 struct if_dqinfo {
 	__u64 dqi_bgrace;
 	__u64 dqi_igrace;
@@ -49,7 +52,7 @@ struct if_dqblk {
 	__u64 dqb_itime;
 	__u32 dqb_valid;
 };
-#define FS_XFLAG_PROJINHERIT 0x00000200
+#define QIF_DQBLKSIZE_BITS 10
 #endif
 
 #ifndef FS_IOC_FSGETXATTR