瀏覽代碼

Merge pull request #27459 from aquasecurity/xfs_quota_fedora_build_fix

projectquota: fix build failure with new kernels
Antonio Murdaca 8 年之前
父節點
當前提交
cd0e399e06
共有 1 個文件被更改,包括 15 次插入0 次删除
  1. 15 0
      daemon/graphdriver/projectquota.go

+ 15 - 0
daemon/graphdriver/projectquota.go

@@ -17,6 +17,8 @@ package graphdriver
 #include <linux/fs.h>
 #include <linux/fs.h>
 #include <linux/quota.h>
 #include <linux/quota.h>
 #include <linux/dqblk_xfs.h>
 #include <linux/dqblk_xfs.h>
+
+#ifndef FS_XFLAG_PROJINHERIT
 struct fsxattr {
 struct fsxattr {
 	__u32		fsx_xflags;
 	__u32		fsx_xflags;
 	__u32		fsx_extsize;
 	__u32		fsx_extsize;
@@ -25,13 +27,26 @@ struct fsxattr {
 	unsigned char	fsx_pad[12];
 	unsigned char	fsx_pad[12];
 };
 };
 #define FS_XFLAG_PROJINHERIT	0x00000200
 #define FS_XFLAG_PROJINHERIT	0x00000200
+#endif
+#ifndef FS_IOC_FSGETXATTR
 #define FS_IOC_FSGETXATTR		_IOR ('X', 31, struct fsxattr)
 #define FS_IOC_FSGETXATTR		_IOR ('X', 31, struct fsxattr)
+#endif
+#ifndef FS_IOC_FSSETXATTR
 #define FS_IOC_FSSETXATTR		_IOW ('X', 32, struct fsxattr)
 #define FS_IOC_FSSETXATTR		_IOW ('X', 32, struct fsxattr)
+#endif
 
 
+#ifndef PRJQUOTA
 #define PRJQUOTA	2
 #define PRJQUOTA	2
+#endif
+#ifndef XFS_PROJ_QUOTA
 #define XFS_PROJ_QUOTA	2
 #define XFS_PROJ_QUOTA	2
+#endif
+#ifndef Q_XSETPQLIM
 #define Q_XSETPQLIM QCMD(Q_XSETQLIM, PRJQUOTA)
 #define Q_XSETPQLIM QCMD(Q_XSETQLIM, PRJQUOTA)
+#endif
+#ifndef Q_XGETPQUOTA
 #define Q_XGETPQUOTA QCMD(Q_XGETQUOTA, PRJQUOTA)
 #define Q_XGETPQUOTA QCMD(Q_XGETQUOTA, PRJQUOTA)
+#endif
 */
 */
 import "C"
 import "C"
 import (
 import (