hi Jan,
I've attached Yu-Chan's quota.h -- does this look familiar to
you? It is clearly not the quota.h from the XFS CVS as I had
originally thought. It may be the one from the XFS 1.1 CDs,
which is a Redhat-based, XFS-enabled distro, so would have an
earlier version of your VFS quota patches (via -ac kernel).
Either way, it doesn't really matter. We need to fix Samba,
and a local header for those folks similar to the ones in the
quota tools, I guess, seems like the best option to me too.
The configure script and quota.c could then be tidied up a bit
here too - long time since I looked at that code though.
cheers.
--
Nathan
----- Forwarded message from Yu-Chan Park <super@linuxone.co.kr> -----
Date: Wed, 8 May 2002 13:20:04 +0900
To: "Nathan Scott" <nathans@sgi.com>
X-Mailer: Microsoft Outlook Express 5.50.4807.1700
From: "Yu-Chan Park" <super@linuxone.co.kr>
Subject: Re: SAMBA compile errors at XFS kernel..
Thanks your help
I attach my quota.h file
regards..
Yu-Chan Park
----- Original Message -----
From: "Nathan Scott" <nathans@sgi.com>
To: "Yu-Chan Park" <super@linuxone.co.kr>
Sent: Wednesday, May 08, 2002 7:55 AM
Subject: Re: SAMBA compile errors at XFS kernel..
> hi Yu-Chan,
>
> Can you send me a copy of your /usr/include/linux/quota.h
> file please? We're just trying to understand where it came
> from originally and whats causing these errors exactly.
>
> thanks.
>
>
> On Wed, May 08, 2002 at 12:40:55AM +0200, Jan Kara wrote:
> > Hello,
> >
> > Umm.. I can understand complaints of compiler about __kernel_uid32_t
> > in the definition of qid_t. But I can't understand those problem
with
> > __kernel_time_t. I can't see it anywhere in the quota.h - even
time_t
> > is in #ifdef __KERNEL__. Anyway creating userspace version of header
> > is probably the right way out of problems... I'll try to create
some
> > userspace header file...
> >
> > Honza
> >
> > > Some more people are hitting this problem with the new VFS
> > > quota patches which we have in XFS CVS. Any idea on how we
> > > should go about fixing this? Maybe we should fix Samba so
> > > as to not include kernel headers (as we do in the quota user
> > > tools already), creating a local header for them instead
> > > with only the structures/macros they need?
> > >
> > > thanks.
> > >
> > >
> > > On Tue, May 07, 2002 at 11:15:45AM +0900, Yu-Chan Park wrote:
> > > > Hello xfs..
> > > >
> > > > I have compiled samba 2.2.4(new release version) with gcc
2.95 or gcc 2.96 version based
> > > > RedHat 7.2 and kernel 2.4.18 version which patched
xfs(release 1.0)
> > > >
> > > > But during compiling samba occure compile errors at quota
> > > >
> > > > If using kernel not patched xfs samba is compiled as well.
> > > >
> > > > How can i escape hell :) ?
> > > >
> > > > Thanks..
> > > >
> > > > The errors are....
> > > >
> > > > Compiling smbd/quotas.c
> > > > smbd/quotas.c:66: warning: `LINUX_QUOTAS_2' redefined
> > > > include/config.h:238: warning: this is the location of the
previous definition
> > > > In file included from smbd/quotas.c:45:
> > > > /usr/include/asm/types.h:18: warning: redefinition of
`__u32'
> > > > /usr/include/sys/capability.h:32: warning: `__u32'
previously declared here
> > > > In file included from smbd/quotas.c:57:
> > > > /usr/include/linux/quota.h:45: parse error before
`qid_t'
> > > > /usr/include/linux/quota.h:45: warning: data definition has
no type or storage class
> > > > /usr/include/linux/quota.h:137: parse error before
`__kernel_time_t'
> > > > /usr/include/linux/quota.h:137: warning: no semicolon at end
of struct or union
> > > > /usr/include/linux/quota.h:138: warning: data definition has
no type or storage class
> > > > /usr/include/linux/quota.h:274: parse error before
`qid_t'
> > > > smbd/quotas.c: In function `get_smb_linux_vfs_quota':
> > > > smbd/quotas.c:115: storage size of `D' isn't known
> > > > make: *** [smbd/quotas.o] Error 1
> > > >
> > > >
> > >
> > > --
> > > Nathan
>
> --
> Nathan
----- End forwarded message -----
-------------- next part --------------
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Robert Elz at The University of Melbourne.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Version: $Id: quota.h,v 2.0 1996/11/17 16:48:14 mvw Exp mvw $
*/
#ifndef _LINUX_QUOTA_
#define _LINUX_QUOTA_
#include <linux/errno.h>
#include <linux/types.h>
typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
typedef __u64 qsize_t; /* Type in which we store size limitations */
#define MAXQUOTAS 2
#define USRQUOTA 0 /* element used for user quotas */
#define GRPQUOTA 1 /* element used for group quotas */
/*
* Definitions for the default names of the quotas files.
*/
#define INITQFNAMES { \
"user", /* USRQUOTA */ \
"group", /* GRPQUOTA */ \
"undefined", \
}
/*
* Definitions of magics and versions of current quota files
*/
#define INITQMAGICS {\
0xd9c01f11, /* USRQUOTA */\
0xd9c01927 /* GRPQUOTA */\
}
#define INITQVERSIONS {\
0, /* USRQUOTA */\
0 /* GRPQUOTA */\
}
#define QUOTAFILENAME "aquota"
#define QUOTAGROUP "staff"
/* Size of blocks in which are counted size limits */
#define QUOTABLOCK_BITS 10
#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS)
/* Conversion routines from and to quota blocks */
#define qb2kb(x) ((x) << (QUOTABLOCK_BITS-10))
#define kb2qb(x) ((x) >> (QUOTABLOCK_BITS-10))
#define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS)
/*
* Command definitions for the 'quotactl' system call.
* The commands are broken into a main command defined below
* and a subcommand that is used to convey the type of
* quota that is being manipulated (see above).
*/
#define SUBCMDMASK 0x00ff
#define SUBCMDSHIFT 8
#define QCMD(cmd, type) (((cmd) << SUBCMDSHIFT) | ((type) &
SUBCMDMASK))
#define Q_QUOTAON 0x0100 /* enable quotas */
#define Q_QUOTAOFF 0x0200 /* disable quotas */
/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now other
parameteres */
#define Q_SYNC 0x0600 /* sync disk copy of a filesystems quotas */
#define Q_SETQLIM 0x0700 /* set limits */
/* GETSTATS at 0x0800 is now longer... */
#define Q_GETINFO 0x0900 /* get info about quotas - graces, flags... */
#define Q_SETINFO 0x0A00 /* set info about quotas */
#define Q_SETGRACE 0x0B00 /* set inode and block grace */
#define Q_SETFLAGS 0x0C00 /* set flags for quota */
#define Q_GETQUOTA 0x0D00 /* get limits and usage */
#define Q_SETQUOTA 0x0E00 /* set limits and usage */
#define Q_SETUSE 0x0F00 /* set usage */
/* 0x1000 used by old RSQUASH */
/* 0x1100 used by GETSTATS v2, since replaced by procfs entry */
/*
* The following structure defines the format of the disk quota file
* (as it appears on disk) - the file is a hash table whose entries points
* to blocks of these structures.
*/
struct disk_dqblk {
__u32 dqb_id; /* id this quota applies to */
__u32 dqb_ihardlimit; /* absolute limit on allocated inodes */
__u32 dqb_isoftlimit; /* preferred inode limit */
__u32 dqb_curinodes; /* current # allocated inodes */
__u32 dqb_bhardlimit; /* absolute limit on disk space (in QUOTABLOCK_SIZE) */
__u32 dqb_bsoftlimit; /* preferred limit on disk space (in QUOTABLOCK_SIZE) */
__u64 dqb_curspace; /* current space occupied (in bytes) */
__u64 dqb_btime; /* time limit for excessive disk use */
__u64 dqb_itime; /* time limit for excessive inode use */
};
/* This is in-memory copy of quota block. See meaning of entries above */
struct mem_dqblk {
unsigned int dqb_ihardlimit;
unsigned int dqb_isoftlimit;
unsigned int dqb_curinodes;
unsigned int dqb_bhardlimit;
unsigned int dqb_bsoftlimit;
qsize_t dqb_curspace;
__kernel_time_t dqb_btime;
__kernel_time_t dqb_itime;
};
/*
* Here are header structures as written on disk and their in-memory copies
*/
/* First generic header */
struct disk_dqheader {
__u32 dqh_magic; /* Magic number identifying file */
__u32 dqh_version; /* File version */
};
/* Header with type and version specific information */
struct disk_dqinfo {
__u32 dqi_bgrace; /* Time before block soft limit becomes hard limit */
__u32 dqi_igrace; /* Time before inode soft limit becomes hard limit */
__u32 dqi_flags; /* Flags for quotafile (DQF_*) */
__u32 dqi_blocks; /* Number of blocks in file */
__u32 dqi_free_blk; /* Number of first free block in the list */
__u32 dqi_free_entry; /* Number of block with at least one free entry */
};
/* Inmemory copy of version specific information */
struct mem_dqinfo {
unsigned int dqi_bgrace;
unsigned int dqi_igrace;
unsigned int dqi_flags;
unsigned int dqi_blocks;
unsigned int dqi_free_blk;
unsigned int dqi_free_entry;
};
/* Flags for version specific files */
#define DQF_MASK 0x0000 /* Mask for all valid ondisk flags */
#ifdef __KERNEL__
#define DQF_DIRTY 0x0010 /* Is info dirty? */
extern inline void mark_info_dirty(struct mem_dqinfo *info)
{
info->dqi_flags |= DQF_DIRTY;
}
#define info_dirty(info) ((info)->dqi_flags & DQF_DIRTY)
#endif
/*
* Structure of header of block with quota structures. It is padded to 16 bytes
so
* there will be space for exactly 18 quota-entries in a block
*/
struct disk_dqdbheader {
__u32 dqdh_next_free; /* Number of next block with free entry */
__u32 dqdh_prev_free; /* Number of previous block with free entry */
__u16 dqdh_entries; /* Number of valid entries in block */
__u16 dqdh_pad1;
__u32 dqdh_pad2;
};
#define DQINFOOFF sizeof(struct disk_dqheader) /* Offset of info header in file
*/
#define DQBLKSIZE_BITS 10
#define DQBLKSIZE (1 << DQBLKSIZE_BITS) /* Size of block with quota
structures */
#define DQTREEOFF 1 /* Offset of tree in file in blocks */
#define DQTREEDEPTH 4 /* Depth of quota tree */
#define DQSTRINBLK ((DQBLKSIZE - sizeof(struct disk_dqdbheader)) / sizeof(struct
disk_dqblk)) /* Number of entries in one blocks */
struct dqstats {
__u32 lookups;
__u32 drops;
__u32 reads;
__u32 writes;
__u32 cache_hits;
__u32 allocated_dquots;
__u32 free_dquots;
__u32 syncs;
__u32 version;
};
#ifdef __KERNEL__
extern int nr_dquots, nr_free_dquots;
#define NR_DQHASH 43 /* Just an arbitrary number */
#define DQ_LOCKED 0x01 /* dquot under IO */
#define DQ_MOD 0x02 /* dquot modified since read */
#define DQ_BLKS 0x10 /* uid/gid has been warned about blk limit */
#define DQ_INODES 0x20 /* uid/gid has been warned about inode limit */
#define DQ_FAKE 0x40 /* no limits only usage */
#define DQ_INVAL 0x80 /* dquot is going to be invalidated */
struct dquot {
struct list_head dq_hash; /* Hash list in memory */
struct list_head dq_inuse; /* List of all quotas */
struct list_head dq_free; /* Free list element */
wait_queue_head_t dq_wait_lock; /* Pointer to waitqueue on dquot lock */
wait_queue_head_t dq_wait_free; /* Pointer to waitqueue for quota to be unused
*/
int dq_count; /* Use count */
int dq_dup_ref; /* Number of duplicated refences */
/* fields after this point are cleared when invalidating */
struct super_block *dq_sb; /* superblock this applies to */
qid_t dq_id; /* ID this applies to (uid, gid) */
kdev_t dq_dev; /* Device this applies to */
short dq_type; /* Type of quota */
short dq_flags; /* See DQ_* */
loff_t dq_off; /* Offset of structure in file (0 for not allocated) */
unsigned long dq_referenced; /* Number of times this dquot was
referenced during its lifetime */
struct mem_dqblk dq_dqb; /* Diskquota usage */
};
#define NODQUOT (struct dquot *)NULL
#define dq_curspace dq_dqb.dqb_curspace
#define dq_curinodes dq_dqb.dqb_curinodes
#define dq_isoftlimit dq_dqb.dqb_isoftlimit
#define dq_ihardlimit dq_dqb.dqb_ihardlimit
#define dq_bsoftlimit dq_dqb.dqb_bsoftlimit
#define dq_bhardlimit dq_dqb.dqb_bhardlimit
#define dq_itime dq_dqb.dqb_itime
#define dq_btime dq_dqb.dqb_btime
/*
* Flags used for set_info
*/
#define ISET_GRACE 0x01
#define ISET_FLAGS 0x02
#define ISET_ALL 0x03
#define QUOTA_OK 0
#define NO_QUOTA 1
typedef char *dqbuf_t;
#else
# /* nodep */ include <sys/cdefs.h>
__BEGIN_DECLS
long quotactl __P ((int, const char *, qid_t, __kernel_caddr_t));
__END_DECLS
#endif /* __KERNEL__ */
#endif /* _QUOTA_ */
