summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-09-07 13:13:49 +0200
committerBjoern Jacke <bj@sernet.de>2012-09-07 15:59:46 +0200
commitee2d6ae1480496c89f483cc3613f025a9342b6ab (patch)
tree347ef80539bb4458f534ed473f0f7838895415ee
parent3810ee4e87eda67583f4458435b28112ee711300 (diff)
downloadsamba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.tar.gz
samba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.tar.bz2
samba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.zip
s3:quota: clean up and consolidate the xfs quota checks and defines
Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Fri Sep 7 15:59:46 CEST 2012 on sn-devel-104
-rw-r--r--source3/configure.in7
-rw-r--r--source3/lib/sysquotas.c2
-rw-r--r--source3/lib/sysquotas_xfs.c14
3 files changed, 11 insertions, 12 deletions
diff --git a/source3/configure.in b/source3/configure.in
index e76e4e42c0..0bae24bead 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4576,7 +4576,7 @@ AC_CHECK_HEADERS(sys/fs/vx_quota.h)
# For quotas on XFS filesystems, Linux style
AC_CHECK_HEADERS(xfs/xqm.h,[
- AC_DEFINE(HAVE_LINUX_XFS_QUOTAS,1,[Whether Linux xfs quota support is available])
+ AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
])
# For sys/quota.h and linux/quota.h
@@ -4601,7 +4601,7 @@ AC_TRY_COMPILE([
],[int i = Q_XGETQUOTA;],
samba_cv_HAVE_SYS_QUOTA_XFS=yes,samba_cv_HAVE_SYS_QUOTA_XFS=no)])
if test "$samba_cv_HAVE_SYS_QUOTA_XFS"x = "yes"x; then
- samba_cv_found_xfs_header=yes
+ AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
fi
fi
@@ -4693,9 +4693,6 @@ if test x"$samba_cv_SYSQUOTA_FOUND" = x"yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_QUOTAS,1,[Whether to use disk quota support])
AC_DEFINE(HAVE_SYS_QUOTAS,1,[Whether the new lib/sysquotas.c interface can be used])
- if test x"$samba_cv_found_xfs_header" = x"yes"; then
- AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
- fi
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(whether to use the old quota support)
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