quota: Remove dq_wait_unused from dquot

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

diff --git a/include/linux/quota.h b/include/linux/quota.h
index bfd077ca6ac3d642026267fa73ce2432126f8aef..ad6809f099ac6eff72fa80cd4ed74d353cf96d76 100644 (file)
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -299,7 +299,6 @@ struct dquot {
        struct list_head dq_dirty;      /* List of dirty dquots */
        struct mutex dq_lock;           /* dquot IO lock */
        atomic_t dq_count;              /* Use count */
-       wait_queue_head_t dq_wait_unused;       /* Wait queue for dquot to become unused */
        struct super_block *dq_sb;      /* superblock this applies to */
        struct kqid dq_id;              /* ID this applies to (uid, gid, projid) */
        loff_t dq_off;                  /* Offset of dquot on disk */
@@ -521,7 +520,7 @@ static inline void quota_send_warning(struct kqid qid, dev_t dev,
 
 struct quota_info {
        unsigned int flags;                     /* Flags for diskquotas on this device */
-       struct mutex dqio_mutex;                /* lock device while I/O in progress */
+       struct rw_semaphore dqio_sem;           /* Lock quota file while I/O in progress */
        struct inode *files[MAXQUOTAS];         /* inodes of quotafiles */
        struct mem_dqinfo info[MAXQUOTAS];      /* Information for each quota type */
        const struct quota_format_ops *ops[MAXQUOTAS];  /* Operations for each type */