sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

XFS quota patch from Stefan Metzmacher <metze@metzemix.de>.

Browse Source 
Jeremy.
(This used to be commit cae5f158e583572436a2f4c20d919816d763f93d)
This commit is contained in:
Jeremy Allison 2004-01-06 18:13:32 +00:00
parent 65111149b5
commit 67da3026a4
5 changed files with 74 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -352,7 +352,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/posix_acls.o lib/sysacls.o lib/server_mutex.o \
smbd/process.o smbd/service.o smbd/error.o \
printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
lib/sysquotas_xfs.o \
lib/sysquotas_xfs.o lib/sysquotas_4A.o \
smbd/change_trust_pw.o smbd/fake_file.o \
smbd/quotas.o smbd/ntquotas.o lib/afs.o \
$(MANGLE_OBJ) @VFS_STATIC@

29
source3/configure.in
View File

@ -3121,8 +3121,9 @@ AC_MSG_CHECKING(whether to try the lib/sysquotas.c interface on ${host_os})
samba_cv_RUN_QUOTA_TESTS=yes
samba_cv_SYSQUOTA_FOUND=yes
AC_DEFINE(HAVE_QUOTACTL_LINUX,1,[Whether Linux quota support is available])
AC_DEFINE(HAVE_LINUX_XFS_QUOTAS,1,[Whether Linux xfs quota support is available])
samba_cv_sysquotas_file="lib/sysquotas_linux.c"
AC_DEFINE(HAVE_LINUX_XFS_QUOTAS,1,[Whether Linux xfs quota support is available])
samba_cv_found_xfs_header=yes
;;
*)
AC_MSG_RESULT(no)
@ -3147,7 +3148,7 @@ AC_CHECK_HEADERS(sys/fs/vx_quota.h)
# For sys/quota.h and linux/quota.h
AC_CHECK_HEADERS(sys/quota.h)
if test x"$samba_cv_found_xfs_header" = x"no"; then
if test x"$samba_cv_found_xfs_header" != x"yes"; then
# if we have xfs quota support <sys/quota.h> (IRIX) we should use it
AC_CACHE_CHECK([for XFS QUOTA in <sys/quota.h>],samba_cv_HAVE_SYS_QUOTA_XFS, [
AC_TRY_COMPILE([
@ -3162,11 +3163,10 @@ 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
AC_DEFINE(HAVE_IRIX_XFS_QUOTAS,1,[Whether IRIX xfs quota support is available])
samba_cv_found_xfs_header=yes
fi
fi
# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
AC_CACHE_CHECK([if struct dqblk has .dqb_fsoftlimit],samba_cv_HAVE_DQB_FSOFTLIMIT, [
AC_TRY_COMPILE([
@ -3288,6 +3288,27 @@ AC_MSG_CHECKING(whether to use the new lib/sysquotas.c interface)
fi
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no" -a x"$samba_cv_found_xfs_header" = x"yes"; then
AC_CACHE_CHECK([whether the sys_quota interface works with XFS],samba_cv_SYSQUOTA_WORKS_XFS,[
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch"
AC_TRY_COMPILE([
#include "confdefs.h"
#define NO_PROTO_H 1
#define NO_CONFIG_H 1
#define HAVE_SYS_QUOTAS 1
#define HAVE_XFS_QUOTAS 1
#include "${srcdir-.}/lib/sysquotas_xfs.c"
],[],samba_cv_SYSQUOTA_WORKS_XFS=yes,samba_cv_SYSQUOTA_WORKS_XFS=no)
CPPFLAGS="$SAVE_CPPFLAGS"
])
if test x"$samba_cv_SYSQUOTA_WORKS_XFS" = x"yes"; then
if test x"$samba_cv_WE_USE_SYS_QUOTAS" = x"yes"; then
AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
fi
fi
fi
AC_CACHE_CHECK([whether the old quota support works],samba_cv_QUOTA_WORKS,[
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I. -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper -I${srcdir-.}/nsswitch"

8
source3/lib/sysquotas_4A.c
View File

@ -1,6 +1,6 @@
/*
Unix SMB/CIFS implementation.
System QUOTA function wrappers for LINUX
System QUOTA function wrappers for QUOTACTL_4A
Copyright (C) Stefan (metze) Metzmacher 2003
This program is free software; you can redistribute it and/or modify
@ -45,6 +45,10 @@
#define QCMD(x,y) x
#endif
#ifndef QCMD
#define QCMD(x,y) x
#endif
#ifdef GRPQUOTA
#define HAVE_GROUP_QUOTA
#endif
@ -309,4 +313,6 @@ int sys_set_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
return ret;
}
#else /* HAVE_QUOTACTL_4A */
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */

9
source3/lib/sysquotas_linux.c
View File

@ -312,9 +312,6 @@ static int sys_set_linux_gen_quota(const char *path, const char *bdev, enum SMB_
struct if_dqblk D;
SMB_BIG_UINT bsize = (SMB_BIG_UINT)QUOTABLOCK_SIZE;
if (!path||!bdev||!dp)
smb_panic("sys_set_linux_gen_quota: called with NULL pointer");
ZERO_STRUCT(D);
if (bsize == dp->bsize) {
@ -366,7 +363,7 @@ int sys_get_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
int ret = -1;
if (!path||!bdev||!dp)
smb_panic("sys_get_linux_quota: called with NULL pointer");
smb_panic("sys_set_vfs_quota: called with NULL pointer");
ZERO_STRUCT(*dp);
dp->qtype = qtype;
@ -429,7 +426,7 @@ int sys_set_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
uint32 oldqflags = 0;
if (!path||!bdev||!dp)
smb_panic("sys_set_linux_v1_quota: called with NULL pointer");
smb_panic("sys_set_vfs_quota: called with NULL pointer");
oldqflags = dp->qflags;
@ -483,4 +480,6 @@ int sys_set_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
return ret;
}
#else /* HAVE_QUOTACTL_LINUX */
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */

68
source3/lib/sysquotas_xfs.c
View File

@ -21,19 +21,20 @@
#include "includes.h"
#ifdef HAVE_XFS_QUOTA
#include "samba_xfs_quota.h"
#define HAVE_LINUX_XFS_QUOTA
#ifndef HAVE_SYS_QUOTAS
#ifdef HAVE_XFS_QUOTAS
#undef HAVE_XFS_QUOTAS
#endif
#endif
#ifdef HAVE_LINUX_XFS_QUOTA
#ifdef HAVE_XFS_QUOTAS
/* Linux has BBSIZE in <linux/xfs_fs.h>
* or <xfs/xfs_fs.h>
* IRIX has BBSIZE in <sys/param.h>
*/
#ifdef HAVE_XFS_FS_HEADER
#include HAVE_XFS_FS_HEADER
#ifdef HAVE_LINUX_XFS_QUOTAS
#include "samba_linux_quota.h"
#include "samba_xfs_quota.h"
#define HAVE_GROUP_QUOTA
#else /* IRIX */
#include <sys/quota.h>
#endif
/* on IRIX */
@ -47,7 +48,16 @@
#define Q_XGETQSTAT Q_GETQSTAT
#endif /* Q_XGETQSTAT */
/* currently doesn't support Group and Project quotas on IRIX
*/
#ifndef QCMD
#define QCMD(x,y) x
#endif
/*
* IRIX has BBSIZE in <sys/param.h>
*/
#ifndef BBSHIFT
#define BBSHIFT 9
#endif /* BBSHIFT */
@ -55,12 +65,6 @@
#define BBSIZE (1<<BBSHIFT)
#endif /* BBSIZE */
#ifdef IRIX6
#ifndef QUOTABLOCK_SIZE
#define QUOTABLOCK_SIZE BBSIZE
#endif
#endif
/****************************************************************************
Abstract out the XFS Quota Manager quota get call.
****************************************************************************/
@ -108,10 +112,10 @@ int sys_get_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
case SMB_GROUP_FS_QUOTA_TYPE:
quotactl(QCMD(Q_XGETQSTAT,XFS_GROUP_QUOTA), bdev, -1, (caddr_t)&F);
if (F.qs_flags & XFS_QUOTA_UDQ_ENFD) {
if (F.qs_flags & XFS_QUOTA_GDQ_ENFD) {
qflags |= QUOTAS_DENY_DISK;
}
else if (F.qs_flags & XFS_QUOTA_UDQ_ACCT) {
else if (F.qs_flags & XFS_QUOTA_GDQ_ACCT) {
qflags |= QUOTAS_ENABLED;
}
@ -238,10 +242,10 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
quotactl(QCMD(Q_XGETQSTAT,XFS_GROUP_QUOTA), bdev, -1, (caddr_t)&F);
if (qflags & QUOTAS_DENY_DISK) {
if (!(F.qs_flags & XFS_QUOTA_UDQ_ENFD))
q_on |= XFS_QUOTA_UDQ_ENFD;
if (!(F.qs_flags & XFS_QUOTA_UDQ_ACCT))
q_on |= XFS_QUOTA_UDQ_ACCT;
if (!(F.qs_flags & XFS_QUOTA_GDQ_ENFD))
q_on |= XFS_QUOTA_GDQ_ENFD;
if (!(F.qs_flags & XFS_QUOTA_GDQ_ACCT))
q_on |= XFS_QUOTA_GDQ_ACCT;
if (q_on != 0) {
ret = quotactl(QCMD(Q_XQUOTAON,XFS_GROUP_QUOTA),bdev, -1, (caddr_t)&q_on);
@ -250,8 +254,8 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
}
} else if (qflags & QUOTAS_ENABLED) {
if (F.qs_flags & XFS_QUOTA_UDQ_ENFD)
q_off |= XFS_QUOTA_UDQ_ENFD;
if (F.qs_flags & XFS_QUOTA_GDQ_ENFD)
q_off |= XFS_QUOTA_GDQ_ENFD;
if (q_off != 0) {
ret = quotactl(QCMD(Q_XQUOTAOFF,XFS_GROUP_QUOTA),bdev, -1, (caddr_t)&q_off);
@ -259,8 +263,8 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
ret = 0;
}
if (!(F.qs_flags & XFS_QUOTA_UDQ_ACCT))
q_on |= XFS_QUOTA_UDQ_ACCT;
if (!(F.qs_flags & XFS_QUOTA_GDQ_ACCT))
q_on |= XFS_QUOTA_GDQ_ACCT;
if (q_on != 0) {
ret = quotactl(QCMD(Q_XQUOTAON,XFS_GROUP_QUOTA),bdev, -1, (caddr_t)&q_on);
@ -272,10 +276,10 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
/* Switch on XFS_QUOTA_UDQ_ACCT didn't work!
* only swittching off XFS_QUOTA_UDQ_ACCT work
*/
if (F.qs_flags & XFS_QUOTA_UDQ_ENFD)
q_off |= XFS_QUOTA_UDQ_ENFD;
if (F.qs_flags & XFS_QUOTA_UDQ_ACCT)
q_off |= XFS_QUOTA_UDQ_ACCT;
if (F.qs_flags & XFS_QUOTA_GDQ_ENFD)
q_off |= XFS_QUOTA_GDQ_ENFD;
if (F.qs_flags & XFS_QUOTA_GDQ_ACCT)
q_off |= XFS_QUOTA_GDQ_ACCT;
if (q_off !=0) {
ret = quotactl(QCMD(Q_XQUOTAOFF,XFS_GROUP_QUOTA),bdev, -1, (caddr_t)&q_off);
@ -297,4 +301,6 @@ int sys_set_xfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt
return ret;
}
#endif /* HAVE_LINUX_XFS_QUOTA */
#else /* HAVE_XFS_QUOTAS */
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */