summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/sysquotas.c2
-rw-r--r--source3/lib/sysquotas_xfs.c14
2 files changed, 9 insertions, 7 deletions
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 55d4730ab3..76f66a779e 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -172,7 +172,7 @@ static struct {
int (*get_quota)(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
int (*set_quota)(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
} sys_quota_backends[] = {
-#if defined HAVE_XFS_QUOTAS || defined HAVE_LINUX_XFS_QUOTAS
+#if defined HAVE_XFS_QUOTAS
{"xfs", sys_get_xfs_quota, sys_set_xfs_quota},
#endif /* HAVE_XFS_QUOTAS */
#ifdef HAVE_NFS_QUOTAS
diff --git a/source3/lib/sysquotas_xfs.c b/source3/lib/sysquotas_xfs.c
index c0df85d6c9..cf77eace97 100644
--- a/source3/lib/sysquotas_xfs.c
+++ b/source3/lib/sysquotas_xfs.c
@@ -23,18 +23,20 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_QUOTA
-#if defined(HAVE_SYS_QUOTAS) && (defined(HAVE_XFS_QUOTAS) || defined(HAVE_LINUX_XFS_QUOTAS))
+#if defined(HAVE_SYS_QUOTAS) && defined(HAVE_XFS_QUOTAS)
+
+#ifdef HAVE_SYS_QUOTA_H
+#include <sys/quota.h>
+#endif
+
+/* this one should actually come from glibc: */
+/* #include "samba_linux_quota.h" */
-#ifdef HAVE_LINUX_XFS_QUOTAS
-#include "samba_linux_quota.h"
#ifdef HAVE_XFS_XQM_H
#include <xfs/xqm.h>
#endif
#define HAVE_GROUP_QUOTA
-#else /* IRIX */
-#include <sys/quota.h>
-#endif
/* on IRIX */
#ifndef Q_XQUOTAON