diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-07-10 01:15:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:24 -0500 |
| commit | ef591178d08089494f45ab49870a7aaa4f12bed1 (patch) | |
| tree | 9c6e98012d6177c49d215895e2f9337517809088 /source3/smbd | |
| parent | 58e9534300430fa4f2bcb50fb2d1d2990bdbe636 (diff) | |
| download | samba-ef591178d08089494f45ab49870a7aaa4f12bed1.tar.gz samba-ef591178d08089494f45ab49870a7aaa4f12bed1.tar.bz2 samba-ef591178d08089494f45ab49870a7aaa4f12bed1.zip | |
r23786: Use linux/dqblk_xfs.h rather than a private copy of this header in the
Samba3 tree.
This is neater, plus it avoids the need to get legal approval from SGI
to use their GPLv2-only code under GPLv3.
If/when SGI legal sort things out, we could consider adding back this
header for very old systems where linux/dqblk_xfs.h is not available.
(This used to be commit cb435543f84955be75368a3294bc6b627414d876)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/quotas.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index 271f3b5d96..1f30acef33 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -61,7 +61,6 @@ BOOL disk_quotas_vxfs(const pstring name, char *path, SMB_BIG_UINT *bsize, SMB_B */ #include "samba_linux_quota.h" -#include "samba_xfs_quota.h" typedef struct _LINUX_SMB_DISK_QUOTA { SMB_BIG_UINT bsize; @@ -73,6 +72,10 @@ typedef struct _LINUX_SMB_DISK_QUOTA { SMB_BIG_UINT curinodes; /* Current used inodes. */ } LINUX_SMB_DISK_QUOTA; + +#ifdef HAVE_LINUX_DQBLK_XFS_H +#include <linux/dqblk_xfs.h> + /**************************************************************************** Abstract out the XFS Quota Manager quota get call. ****************************************************************************/ @@ -102,6 +105,15 @@ static int get_smb_linux_xfs_quota(char *path, uid_t euser_id, gid_t egrp_id, LI return ret; } +#else +static int get_smb_linux_xfs_quota(char *path, uid_t euser_id, gid_t egrp_id, LINUX_SMB_DISK_QUOTA *dp) +{ + DEBUG(0,("XFS quota support not available\n")); + errno = ENOSYS; + return -1; +} +#endif + /**************************************************************************** Abstract out the old and new Linux quota get calls. |