changeset 4565:a54558861acc HEAD

Check for XFS quota also from xfs/xqm.h
author Timo Sirainen <tss@iki.fi>
date Fri, 11 Aug 2006 01:03:22 +0300
parents 6012b0978d2c
children aa9109a17db6
files configure.in src/plugins/quota/quota-fs.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Aug 11 00:59:40 2006 +0300
+++ b/configure.in	Fri Aug 11 01:03:22 2006 +0300
@@ -18,7 +18,7 @@
   sys/uio.h sys/sysmacros.h sys/resource.h sys/select.h libgen.h \
   sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h \
   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
-  sasl.h sasl/sasl.h)
+  xfs/xqm.h sasl.h sasl/sasl.h)
 
 AC_ARG_ENABLE(ipv6,
 [  --enable-ipv6           Enable IPv6 support (default)],
--- a/src/plugins/quota/quota-fs.c	Fri Aug 11 00:59:40 2006 +0300
+++ b/src/plugins/quota/quota-fs.c	Fri Aug 11 01:03:22 2006 +0300
@@ -18,6 +18,10 @@
 #include <sys/stat.h>
 #ifdef HAVE_LINUX_DQBLK_XFS_H
 #  include <linux/dqblk_xfs.h>
+#  define HAVE_XFS_QUOTA
+#elif defined (HAVE_XFS_XQM_H)
+#  include <xfs/xqm.h> /* CentOS 4.x at least uses this */
+#  define HAVE_XFS_QUOTA
 #endif
 
 #ifndef DEV_BSIZE
@@ -203,7 +207,7 @@
 
 #if defined (HAVE_QUOTACTL) && defined(HAVE_SYS_QUOTA_H)
 	/* Linux */
-#ifdef HAVE_LINUX_DQBLK_XFS_H
+#ifdef HAVE_XFS_QUOTA
 	if (strcmp(root->mount->type, "xfs") == 0) {
 		/* XFS */
 		struct fs_disk_quota xdqblk;