quota: Properly annotate i_dquot arrays with __rcu

Dquots pointed to from i_dquot arrays in inodes are protected by
dquot_srcu. Annotate them as such and change .get_dquots callback to
return properly annotated pointer to make sparse happy.

Fixes: b9ba6f94b238 ("quota: remove dqptr_sem")
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 677a9ad..f38bdd4 100644 (file)
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -674,7 +674,7 @@ struct ext2_inode_info {
        struct inode    vfs_inode;
        struct list_head i_orphan;      /* unlinked but open inodes */
 #ifdef CONFIG_QUOTA
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 #endif
 };
 

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 01f9add..6d85875 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -320,7 +320,7 @@ static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, siz
 static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);
 static int ext2_quota_on(struct super_block *sb, int type, int format_id,
                         const struct path *path);
-static struct dquot **ext2_get_dquots(struct inode *inode)
+static struct dquot __rcu **ext2_get_dquots(struct inode *inode)
 {
        return EXT2_I(inode)->i_dquot;
 }

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index a5d7848..3205d46 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1156,7 +1156,7 @@ struct ext4_inode_info {
        tid_t i_datasync_tid;
 
 #ifdef CONFIG_QUOTA
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 #endif
 
        /* Precomputed uuid+inum+igen checksum for seeding inode checksums */

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index dcba0f8..3f6ed58 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1600,7 +1600,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
                             unsigned int flags);
 
-static struct dquot **ext4_get_dquots(struct inode *inode)
+static struct dquot __rcu **ext4_get_dquots(struct inode *inode)
 {
        return EXT4_I(inode)->i_dquot;
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 65294e3..31554e2 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -829,7 +829,7 @@ struct f2fs_inode_info {
        spinlock_t i_size_lock;         /* protect last_disk_size */
 
 #ifdef CONFIG_QUOTA
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 
        /* quota space reservation, managed internally by quota code */
        qsize_t i_reserved_quota;

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index d45ab09..18cc482 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -2768,7 +2768,7 @@ int f2fs_dquot_initialize(struct inode *inode)
        return dquot_initialize(inode);
 }
 
-static struct dquot **f2fs_get_dquots(struct inode *inode)
+static struct dquot __rcu **f2fs_get_dquots(struct inode *inode)
 {
        return F2FS_I(inode)->i_dquot;
 }

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index dd4264a..10934f9 100644 (file)
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -92,7 +92,7 @@ struct jfs_inode_info {
                } link;
        } u;
 #ifdef CONFIG_QUOTA
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 #endif
        u32 dev;        /* will die when we get wide dev_t */
        struct inode    vfs_inode;

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 8d8e556..ff135a4 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -824,7 +824,7 @@ out:
        return len - towrite;
 }
 
-static struct dquot **jfs_get_dquots(struct inode *inode)
+static struct dquot __rcu **jfs_get_dquots(struct inode *inode)
 {
        return JFS_IP(inode)->i_dquot;
 }

diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
index 82b28fd..accf03d 100644 (file)
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@ -65,7 +65,7 @@ struct ocfs2_inode_info
        tid_t i_sync_tid;
        tid_t i_datasync_tid;
 
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 };
 
 /*

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 6b90642..1259fe0 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -122,7 +122,7 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend);
 static int ocfs2_enable_quotas(struct ocfs2_super *osb);
 static void ocfs2_disable_quotas(struct ocfs2_super *osb);
 
-static struct dquot **ocfs2_get_dquots(struct inode *inode)
+static struct dquot __rcu **ocfs2_get_dquots(struct inode *inode)
 {
        return OCFS2_I(inode)->i_dquot;
 }

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 2275446..f73016c 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -998,8 +998,7 @@ EXPORT_SYMBOL(dqget);
 
 static inline struct dquot __rcu **i_dquot(struct inode *inode)
 {
-       /* Force __rcu for now until filesystems are fixed */
-       return (struct dquot __rcu **)inode->i_sb->s_op->get_dquots(inode);
+       return inode->i_sb->s_op->get_dquots(inode);
 }
 
 static int dqinit_needed(struct inode *inode, int type)

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 7256678..b655491 100644 (file)
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -97,7 +97,7 @@ struct reiserfs_inode_info {
        struct rw_semaphore i_xattr_sem;
 #endif
 #ifdef CONFIG_QUOTA
-       struct dquot *i_dquot[MAXQUOTAS];
+       struct dquot __rcu *i_dquot[MAXQUOTAS];
 #endif
 
        struct inode vfs_inode;

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 67b5510..7b3d5ae 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -802,7 +802,7 @@ static ssize_t reiserfs_quota_write(struct super_block *, int, const char *,
 static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,
                                   loff_t);
 
-static struct dquot **reiserfs_get_dquots(struct inode *inode)
+static struct dquot __rcu **reiserfs_get_dquots(struct inode *inode)
 {
        return REISERFS_I(inode)->i_dquot;
 }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ed5966a..d0b849e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2159,7 +2159,7 @@ struct super_operations {
 #ifdef CONFIG_QUOTA
        ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
        ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
-       struct dquot **(*get_dquots)(struct inode *);
+       struct dquot __rcu **(*get_dquots)(struct inode *);
 #endif
        long (*nr_cached_objects)(struct super_block *,
                                  struct shrink_control *);

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 2caa6b8..66828df 100644 (file)
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -37,7 +37,7 @@ struct shmem_inode_info {
        unsigned int            fsflags;        /* for FS_IOC_[SG]ETFLAGS */
        atomic_t                stop_eviction;  /* hold when working on inode */
 #ifdef CONFIG_TMPFS_QUOTA
-       struct dquot            *i_dquot[MAXQUOTAS];
+       struct dquot __rcu      *i_dquot[MAXQUOTAS];
 #endif
        struct inode            vfs_inode;
 };

diff --git a/mm/shmem.c b/mm/shmem.c
index d7c84ff..791a6dc 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -311,7 +311,7 @@ static void shmem_disable_quotas(struct super_block *sb)
                dquot_quota_off(sb, type);
 }
 
-static struct dquot **shmem_get_dquots(struct inode *inode)
+static struct dquot __rcu **shmem_get_dquots(struct inode *inode)
 {
        return SHMEM_I(inode)->i_dquot;
 }