sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

s3:quota: clean up and consolidate the xfs quota checks and defines

Browse Source 
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Sep  7 15:59:46 CEST 2012 on sn-devel-104
This commit is contained in:
Björn Jacke 2012-09-07 13:13:49 +02:00 committed by Bjoern Jacke
parent 3810ee4e87
commit ee2d6ae148
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/configure.in
View File

@ -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)

2
source3/lib/sysquotas.c
View File

@ -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

14
source3/lib/sysquotas_xfs.c
View File

@ -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