quota: Properly annotate i_dquot arrays with __rcu

jankara · Sasha Levin · commit 42954c374534 · 2024-03-26T18:19:46.000-04:00
[ Upstream commit ccb4901 ] 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: b9ba6f9 ("quota: remove dqptr_sem") Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git 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
@@ -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
@@ -1146,7 +1146,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
@@ -1593,7 +1593,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
@@ -824,7 +824,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
@@ -2756,7 +2756,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
@@ -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
@@ -824,7 +824,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,
 	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
@@ -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
@@ -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
@@ -1008,8 +1008,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
@@ -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
@@ -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
@@ -2079,7 +2079,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
@@ -32,7 +32,7 @@ struct shmem_inode_info {
 	struct timespec64	i_crtime;	/* file creation time */
 	unsigned int		fsflags;	/* flags for FS_IOC_[SG]ETFLAGS */
 #ifdef CONFIG_TMPFS_QUOTA
-	struct dquot		*i_dquot[MAXQUOTAS];
+	struct dquot __rcu	*i_dquot[MAXQUOTAS];
 #endif
 	struct offset_ctx	dir_offsets;	/* stable entry offsets */
 	struct inode		vfs_inode;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ static ssize_t ext2_quota_read(struct super_block sb, int type, char data, siz`
`320`	`320`	`static ssize_t ext2_quota_write(struct super_block sb, int type, const char data, size_t len, loff_t off);`
`321`	`321`	`static int ext2_quota_on(struct super_block *sb, int type, int format_id,`
`322`	`322`	`const struct path *path);`
`323`		`-static struct dquot *ext2_get_dquots(struct inode inode)`
	`323`	`+static struct dquot __rcu *ext2_get_dquots(struct inode inode)`
`324`	`324`	`{`
`325`	`325`	`return EXT2_I(inode)->i_dquot;`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1593,7 +1593,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,`
`1593`	`1593`	`static int ext4_quota_enable(struct super_block *sb, int type, int format_id,`
`1594`	`1594`	`unsigned int flags);`
`1595`	`1595`
`1596`		`-static struct dquot *ext4_get_dquots(struct inode inode)`
	`1596`	`+static struct dquot __rcu *ext4_get_dquots(struct inode inode)`
`1597`	`1597`	`{`
`1598`	`1598`	`return EXT4_I(inode)->i_dquot;`
`1599`	`1599`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2756,7 +2756,7 @@ int f2fs_dquot_initialize(struct inode *inode)`
`2756`	`2756`	`return dquot_initialize(inode);`
`2757`	`2757`	`}`
`2758`	`2758`
`2759`		`-static struct dquot *f2fs_get_dquots(struct inode inode)`
	`2759`	`+static struct dquot __rcu *f2fs_get_dquots(struct inode inode)`
`2760`	`2760`	`{`
`2761`	`2761`	`return F2FS_I(inode)->i_dquot;`
`2762`	`2762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,`
`824`	`824`	`return len - towrite;`
`825`	`825`	`}`
`826`	`826`
`827`		`-static struct dquot *jfs_get_dquots(struct inode inode)`
	`827`	`+static struct dquot __rcu *jfs_get_dquots(struct inode inode)`
`828`	`828`	`{`
`829`	`829`	`return JFS_IP(inode)->i_dquot;`
`830`	`830`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ static int ocfs2_susp_quotas(struct ocfs2_super *osb, int unsuspend);`
`122`	`122`	`static int ocfs2_enable_quotas(struct ocfs2_super *osb);`
`123`	`123`	`static void ocfs2_disable_quotas(struct ocfs2_super *osb);`
`124`	`124`
`125`		`-static struct dquot *ocfs2_get_dquots(struct inode inode)`
	`125`	`+static struct dquot __rcu *ocfs2_get_dquots(struct inode inode)`
`126`	`126`	`{`
`127`	`127`	`return OCFS2_I(inode)->i_dquot;`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1008,8 +1008,7 @@ EXPORT_SYMBOL(dqget);`
`1008`	`1008`
`1009`	`1009`	`static inline struct dquot __rcu *i_dquot(struct inode inode)`
`1010`	`1010`	`{`
`1011`		`- /* Force __rcu for now until filesystems are fixed */`
`1012`		`- return (struct dquot __rcu **)inode->i_sb->s_op->get_dquots(inode);`
	`1011`	`+ return inode->i_sb->s_op->get_dquots(inode);`
`1013`	`1012`	`}`
`1014`	`1013`
`1015`	`1014`	`static int dqinit_needed(struct inode *inode, int type)`
Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,7 @@ static ssize_t reiserfs_quota_write(struct super_block , int, const char ,`
`802`	`802`	`static ssize_t reiserfs_quota_read(struct super_block , int, char , size_t,`
`803`	`803`	`loff_t);`
`804`	`804`
`805`		`-static struct dquot *reiserfs_get_dquots(struct inode inode)`
	`805`	`+static struct dquot __rcu *reiserfs_get_dquots(struct inode inode)`
`806`	`806`	`{`
`807`	`807`	`return REISERFS_I(inode)->i_dquot;`
`808`	`808`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ static void shmem_disable_quotas(struct super_block *sb)`
`311`	`311`	`dquot_quota_off(sb, type);`
`312`	`312`	`}`
`313`	`313`
`314`		`-static struct dquot *shmem_get_dquots(struct inode inode)`
	`314`	`+static struct dquot __rcu *shmem_get_dquots(struct inode inode)`
`315`	`315`	`{`
`316`	`316`	`return SHMEM_I(inode)->i_dquot;`
`317`	`317`	`}`