xnu-3247.1.106.tar.gz

[apple/xnu.git] / bsd / sys / quota.h

diff --git a/bsd/sys/quota.h b/bsd/sys/quota.h
index eab2cf6c8a9dd1d0dae6570ac20ea7a7040fefab..3693ff59212ca598052f5f38df4d795c7a9b1998 100644 (file)
--- a/bsd/sys/quota.h
+++ b/bsd/sys/quota.h
@@ -1,14 +1,19 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1982, 1986, 1993
  */
 /*
  * Copyright (c) 1982, 1986, 1993


@@ -146,9 +151,9 @@ struct dqfilehdr {
        u_int32_t dqh_maxentries;       /* must be a power of 2 */
        u_int32_t dqh_entrycnt;         /* count of active entries */
        u_int32_t dqh_flags;            /* reserved for now (0) */
        u_int32_t dqh_maxentries;       /* must be a power of 2 */
        u_int32_t dqh_entrycnt;         /* count of active entries */
        u_int32_t dqh_flags;            /* reserved for now (0) */

-       time_t    dqh_chktime;          /* time of last quota check */
-       time_t    dqh_btime;            /* time limit for excessive disk use */
-       time_t    dqh_itime;            /* time limit for excessive files */
+       u_int32_t dqh_chktime;          /* time of last quota check */
+       u_int32_t dqh_btime;            /* time limit for excessive disk use */
+       u_int32_t dqh_itime;            /* time limit for excessive files */

        char      dqh_string[16];       /* tag string */
        u_int32_t dqh_spare[4];         /* pad struct to power of 2 */
 };
        char      dqh_string[16];       /* tag string */
        u_int32_t dqh_spare[4];         /* pad struct to power of 2 */
 };


@@ -160,8 +165,8 @@ struct dqblk {
        u_int32_t dqb_ihardlimit;       /* maximum # allocated inodes + 1 */
        u_int32_t dqb_isoftlimit;       /* preferred inode limit */
        u_int32_t dqb_curinodes;        /* current # allocated inodes */
        u_int32_t dqb_ihardlimit;       /* maximum # allocated inodes + 1 */
        u_int32_t dqb_isoftlimit;       /* preferred inode limit */
        u_int32_t dqb_curinodes;        /* current # allocated inodes */

-       time_t    dqb_btime;            /* time limit for excessive disk use */
-       time_t    dqb_itime;            /* time limit for excessive files */
+       u_int32_t dqb_btime;            /* time limit for excessive disk use */
+       u_int32_t dqb_itime;            /* time limit for excessive files */

        u_int32_t dqb_id;               /* identifier (0 for empty entries) */
        u_int32_t dqb_spare[4];         /* pad struct to power of 2 */
 };
        u_int32_t dqb_id;               /* identifier (0 for empty entries) */
        u_int32_t dqb_spare[4];         /* pad struct to power of 2 */
 };


@@ -173,10 +178,6 @@ struct dqblk {
  * WARNING - keep in sync with struct dqblk
  */
 
  * WARNING - keep in sync with struct dqblk
  */
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 struct user_dqblk {
        u_int64_t dqb_bhardlimit;       /* absolute limit on disk bytes alloc */
        u_int64_t dqb_bsoftlimit;       /* preferred limit on disk bytes */
 struct user_dqblk {
        u_int64_t dqb_bhardlimit;       /* absolute limit on disk bytes alloc */
        u_int64_t dqb_bsoftlimit;       /* preferred limit on disk bytes */


@@ -184,15 +185,11 @@ struct user_dqblk {
        u_int32_t dqb_ihardlimit;       /* maximum # allocated inodes + 1 */
        u_int32_t dqb_isoftlimit;       /* preferred inode limit */
        u_int32_t dqb_curinodes;        /* current # allocated inodes */
        u_int32_t dqb_ihardlimit;       /* maximum # allocated inodes + 1 */
        u_int32_t dqb_isoftlimit;       /* preferred inode limit */
        u_int32_t dqb_curinodes;        /* current # allocated inodes */

-       user_time_t       dqb_btime;            /* time limit for excessive disk use */
-       user_time_t       dqb_itime;            /* time limit for excessive files */
+       u_int32_t dqb_btime;            /* time limit for excessive disk use */
+       u_int32_t dqb_itime;            /* time limit for excessive files */

        u_int32_t dqb_id;               /* identifier (0 for empty entries) */
        u_int32_t dqb_spare[4];         /* pad struct to power of 2 */
 };
        u_int32_t dqb_id;               /* identifier (0 for empty entries) */
        u_int32_t dqb_spare[4];         /* pad struct to power of 2 */
 };

-
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif

 #endif  /* KERNEL_PRIVATE */
 
 #define INITQMAGICS { \
 #endif  /* KERNEL_PRIVATE */
 
 #define INITQMAGICS { \


@@ -218,7 +215,7 @@ struct user_dqblk {
  * golden ratio to the machine's word size.
  */
 #define dqhash1(id, shift, mask)  \
  * golden ratio to the machine's word size.
  */
 #define dqhash1(id, shift, mask)  \

-       ((((id) * 2654435761UL) >> (shift)) & (mask))
+       ((((id) * 2654435761U) >> (shift)) & (mask))

 
 #define dqhash2(id, mask)  \
        (dqhash1((id), 11, (mask)>>1) | 1)
 
 #define dqhash2(id, mask)  \
        (dqhash1((id), 11, (mask)>>1) | 1)


@@ -232,10 +229,10 @@ struct user_dqblk {
  * Compute the hash shift value.
  * It is the word size, in bits, minus the hash table size, in bits.
  */
  * Compute the hash shift value.
  * It is the word size, in bits, minus the hash table size, in bits.
  */

-static __inline int dqhashshift(u_long);
+static __inline int dqhashshift(u_int32_t);

 
 static __inline int
 
 static __inline int

-dqhashshift(u_long size)
+dqhashshift(u_int32_t size)

 {
        int shift;
 
 {
        int shift;
 


@@ -247,7 +244,7 @@ dqhashshift(u_long size)
 
 #ifndef KERNEL
 __BEGIN_DECLS
 
 #ifndef KERNEL
 __BEGIN_DECLS

-int quotactl(char *, int, int, caddr_t);
+int quotactl(const char *, int, int, caddr_t);

 __END_DECLS
 #endif /* !KERNEL */
 
 __END_DECLS
 #endif /* !KERNEL */
 


@@ -261,12 +258,12 @@ __END_DECLS
 struct quotafile {
        lck_mtx_t     qf_lock;       /* quota file mutex */
        struct vnode *qf_vp;         /* quota file vnode */
 struct quotafile {
        lck_mtx_t     qf_lock;       /* quota file mutex */
        struct vnode *qf_vp;         /* quota file vnode */

-       struct ucred *qf_cred;       /* quota file access cred */
+       kauth_cred_t  qf_cred;       /* quota file access cred */

        int           qf_shift;      /* primary hash shift */
        int           qf_maxentries; /* size of hash table (power of 2) */
        int           qf_entrycnt;   /* count of active entries */
        int           qf_shift;      /* primary hash shift */
        int           qf_maxentries; /* size of hash table (power of 2) */
        int           qf_entrycnt;   /* count of active entries */

-       time_t        qf_btime;      /* block quota time limit */
-       time_t        qf_itime;      /* inode quota time limit */
+       u_int32_t     qf_btime;      /* block quota time limit */
+       u_int32_t     qf_itime;      /* inode quota time limit */

 
                                      /* the following 2 fields are protected */
                                      /* by the quota list lock  */
 
                                      /* the following 2 fields are protected */
                                      /* by the quota list lock  */


@@ -293,13 +290,14 @@ struct dquot {
        LIST_ENTRY(dquot) dq_hash;      /* hash list */
        TAILQ_ENTRY(dquot) dq_freelist; /* free list */
        u_int16_t dq_flags;             /* flags, see below */
        LIST_ENTRY(dquot) dq_hash;      /* hash list */
        TAILQ_ENTRY(dquot) dq_freelist; /* free list */
        u_int16_t dq_flags;             /* flags, see below */

-       u_int16_t dq_cnt;               /* count of active references */
+       u_int16_t dq_cnt_unused;        /* Replaced by dq_cnt below */

         u_int16_t dq_lflags;           /* protected by the quota list lock */
        u_int16_t dq_type;              /* quota type of this dquot */
        u_int32_t dq_id;                /* identifier this applies to */
        u_int32_t dq_index;             /* index into quota file */
        struct  quotafile *dq_qfile;    /* quota file that this is taken from */
        struct  dqblk dq_dqb;           /* actual usage & quotas */
         u_int16_t dq_lflags;           /* protected by the quota list lock */
        u_int16_t dq_type;              /* quota type of this dquot */
        u_int32_t dq_id;                /* identifier this applies to */
        u_int32_t dq_index;             /* index into quota file */
        struct  quotafile *dq_qfile;    /* quota file that this is taken from */
        struct  dqblk dq_dqb;           /* actual usage & quotas */

+       uint32_t  dq_cnt;               /* count of active references */

 };
 
 /*
 };
 
 /*


@@ -342,6 +340,7 @@ struct dquot {
 #define        CHOWN   0x02    /* (advisory) change initiated by chown */
 
 
 #define        CHOWN   0x02    /* (advisory) change initiated by chown */
 
 

+#ifdef XNU_KERNEL_PRIVATE

 /*
  * Functions that manage the in-core dquot and the
  * on-disk dqblk data structures.
 /*
  * Functions that manage the in-core dquot and the
  * on-disk dqblk data structures.


@@ -351,8 +350,10 @@ void       dqfileinit(struct quotafile *);
 int    dqfileopen(struct quotafile *, int);
 void   dqfileclose(struct quotafile *, int);
 void   dqflush(struct vnode *);
 int    dqfileopen(struct quotafile *, int);
 void   dqfileclose(struct quotafile *, int);
 void   dqflush(struct vnode *);

-int    dqget(u_long, struct quotafile *, int, struct dquot **);
+int    dqget(u_int32_t, struct quotafile *, int, struct dquot **);
+void   dqhashinit(void);

 void   dqinit(void);
 void   dqinit(void);

+int    dqisinitialized(void);

 void   dqref(struct dquot *);
 void   dqrele(struct dquot *);
 void   dqreclaim(struct dquot *);
 void   dqref(struct dquot *);
 void   dqrele(struct dquot *);
 void   dqreclaim(struct dquot *);


@@ -366,6 +367,7 @@ void        qf_put(struct quotafile *, int type);
 
 __private_extern__ void  munge_dqblk(struct dqblk *dqblkp, struct user_dqblk *user_dqblkp, boolean_t to64);
 __END_DECLS
 
 __private_extern__ void  munge_dqblk(struct dqblk *dqblkp, struct user_dqblk *user_dqblkp, boolean_t to64);
 __END_DECLS

+#endif /* XNU_KERNEL_PRIVATE */

 
 #endif /* KERNEL_PRIVATE */
 
 
 #endif /* KERNEL_PRIVATE */