summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-09-06 17:00:54 +0200
committerBjoern Jacke <bj@sernet.de>2012-09-07 14:15:57 +0200
commit3810ee4e87eda67583f4458435b28112ee711300 (patch)
treee9de17af044ae7f715e1ef4ca3b6cf69de82401a
parentd1623ec025efa74f31db1177727c8cc0d34d03b6 (diff)
downloadsamba-3810ee4e87eda67583f4458435b28112ee711300.tar.gz
samba-3810ee4e87eda67583f4458435b28112ee711300.tar.bz2
samba-3810ee4e87eda67583f4458435b28112ee711300.zip
s3:sysquota_xfs: fix logic so that we actually use this module on Linux
-rw-r--r--source3/lib/sysquotas.c2
-rw-r--r--source3/lib/sysquotas_xfs.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index cbacc7bad0..55d4730ab3 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[] = {
-#ifdef HAVE_XFS_QUOTAS
+#if defined HAVE_XFS_QUOTAS || defined HAVE_LINUX_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 7da40efd9b..c0df85d6c9 100644
--- a/source3/lib/sysquotas_xfs.c
+++ b/source3/lib/sysquotas_xfs.c
@@ -23,13 +23,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_QUOTA
-#ifndef HAVE_SYS_QUOTAS
-#ifdef HAVE_XFS_QUOTAS
-#undef HAVE_XFS_QUOTAS
-#endif
-#endif
-
-#ifdef HAVE_XFS_QUOTAS
+#if defined(HAVE_SYS_QUOTAS) && (defined(HAVE_XFS_QUOTAS) || defined(HAVE_LINUX_XFS_QUOTAS))
#ifdef HAVE_LINUX_XFS_QUOTAS
#include "samba_linux_quota.h"