Commit 9610fbcd authored by Jan Kara's avatar Jan Kara Committed by Ma Wupeng
Browse files

quota: Properly annotate i_dquot arrays with __rcu 

stable inclusion
from stable-v6.6.23
commit 42954c374534f37dd25a4096b52d28e46dc1f8ba
bugzilla: https://gitee.com/openeuler/kernel/issues/I9MPZ8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=42954c374534f37dd25a4096b52d28e46dc1f8ba



--------------------------------

[ Upstream commit ccb49011bb2ebfd66164dbf68c5bff48917bb5ef ]

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: b9ba6f94 ("quota: remove dqptr_sem")
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent abcede93

fs/ext2/ext2.h

+1 −1
Original line number Diff line number Diff line
@@ -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

};

fs/ext2/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,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 */

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1656,7 +1656,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;

}

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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;