This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / include / linux / quota.h

diff --git a/include/linux/quota.h b/include/linux/quota.h
index bbd9134..ac5b90f 100644 (file)
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -45,7 +45,6 @@
 typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
 typedef __u64 qsize_t;          /* Type in which we store sizes */
 
-extern spinlock_t dq_list_lock;
 extern spinlock_t dq_data_lock;
 
 /* Size of blocks in which are counted size limits */
@@ -250,6 +249,8 @@ struct dquot_operations {
        int (*free_inode) (const struct inode *, unsigned long);
        int (*transfer) (struct inode *, struct iattr *);
        int (*write_dquot) (struct dquot *);            /* Ordinary dquot write */
+       int (*acquire_dquot) (struct dquot *);          /* Quota is going to be created on disk */
+       int (*release_dquot) (struct dquot *);          /* Quota is going to be deleted from disk */
        int (*mark_dirty) (struct dquot *);             /* Dquot is marked dirty */
        int (*write_info) (struct super_block *, int);  /* Write of quota "superblock" */
 };
@@ -284,7 +285,8 @@ struct quota_info {
        struct semaphore dqio_sem;              /* lock device while I/O in progress */
        struct semaphore dqonoff_sem;           /* Serialize quotaon & quotaoff */
        struct rw_semaphore dqptr_sem;          /* serialize ops using quota_info struct, pointers from inode to dquots */
-       struct file *files[MAXQUOTAS];          /* fp's to quotafiles */
+       struct inode *files[MAXQUOTAS];         /* inodes of quotafiles */
+       struct vfsmount *mnt[MAXQUOTAS];        /* mountpoint entries of filesystems with quota files */
        struct mem_dqinfo info[MAXQUOTAS];      /* Information for each quota type */
        struct quota_format_ops *ops[MAXQUOTAS];        /* Operations for each type */
 };