bianbu-repo-mirror/bianbu-linux-6.6-fh
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6-fh synced 2025-04-25 01:07:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

quota: Properly annotate i_dquot arrays with __rcu

Browse source 
[ 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: b9ba6f94b2 ("quota: remove dqptr_sem")
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jan Kara 2024-02-06 15:08:19 +01:00 • committed by Sasha Levin
parent e45e8aa2b7
commit 42954c3745
16 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/ext2/ext2.h
View file

@ -674,7 +674,7 @@ struct ext2_inode_info {
struct inode vfs_inode; struct inode vfs_inode;
struct list_head i_orphan; /* unlinked but open inodes */ struct list_head i_orphan; /* unlinked but open inodes */
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
#endif #endif
}; };

2
fs/ext2/super.c
View file

@ -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 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, static int ext2_quota_on(struct super_block *sb, int type, int format_id,
const struct path *path); 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; return EXT2_I(inode)->i_dquot;
} }

2
fs/ext4/ext4.h
View file

@ -1146,7 +1146,7 @@ struct ext4_inode_info {
tid_t i_datasync_tid; tid_t i_datasync_tid;
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
#endif #endif
/* Precomputed uuid+inum+igen checksum for seeding inode checksums */ /* Precomputed uuid+inum+igen checksum for seeding inode checksums */

2
fs/ext4/super.c
View file

@ -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, static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
unsigned int flags); 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; return EXT4_I(inode)->i_dquot;
} }

2
fs/f2fs/f2fs.h
View file

@ -824,7 +824,7 @@ struct f2fs_inode_info {
spinlock_t i_size_lock; /* protect last_disk_size */ spinlock_t i_size_lock; /* protect last_disk_size */
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
/* quota space reservation, managed internally by quota code */ /* quota space reservation, managed internally by quota code */
qsize_t i_reserved_quota; qsize_t i_reserved_quota;

2
fs/f2fs/super.c
View file

@ -2756,7 +2756,7 @@ int f2fs_dquot_initialize(struct inode *inode)
return dquot_initialize(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; return F2FS_I(inode)->i_dquot;
} }

2
fs/jfs/jfs_incore.h
View file

@ -92,7 +92,7 @@ struct jfs_inode_info {
} link; } link;
} u; } u;
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
#endif #endif
u32 dev; /* will die when we get wide dev_t */ u32 dev; /* will die when we get wide dev_t */
struct inode vfs_inode; struct inode vfs_inode;

2
fs/jfs/super.c
View file

@ -824,7 +824,7 @@ out:
return len - towrite; 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; return JFS_IP(inode)->i_dquot;
} }

2
fs/ocfs2/inode.h
View file

@ -65,7 +65,7 @@ struct ocfs2_inode_info
tid_t i_sync_tid; tid_t i_sync_tid;
tid_t i_datasync_tid; tid_t i_datasync_tid;
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
}; };
/* /*

2
fs/ocfs2/super.c
View file

@ -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 int ocfs2_enable_quotas(struct ocfs2_super *osb);
static void ocfs2_disable_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; return OCFS2_I(inode)->i_dquot;
} }

3
fs/quota/dquot.c
View file

@ -1008,8 +1008,7 @@ EXPORT_SYMBOL(dqget);
static inline struct dquot __rcu **i_dquot(struct inode *inode) static inline struct dquot __rcu **i_dquot(struct inode *inode)
{ {
/* Force __rcu for now until filesystems are fixed */ return inode->i_sb->s_op->get_dquots(inode);
return (struct dquot __rcu **)inode->i_sb->s_op->get_dquots(inode);
} }
static int dqinit_needed(struct inode *inode, int type) static int dqinit_needed(struct inode *inode, int type)

2
fs/reiserfs/reiserfs.h
View file

@ -97,7 +97,7 @@ struct reiserfs_inode_info {
struct rw_semaphore i_xattr_sem; struct rw_semaphore i_xattr_sem;
#endif #endif
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
#endif #endif
struct inode vfs_inode; struct inode vfs_inode;

2
fs/reiserfs/super.c
View file

@ -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, static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,
loff_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; return REISERFS_I(inode)->i_dquot;
} }

2
include/linux/fs.h
View file

@ -2079,7 +2079,7 @@ struct super_operations {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); 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); 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 #endif
long (*nr_cached_objects)(struct super_block *, long (*nr_cached_objects)(struct super_block *,
struct shrink_control *); struct shrink_control *);

2
include/linux/shmem_fs.h
View file

@ -32,7 +32,7 @@ struct shmem_inode_info {
struct timespec64 i_crtime; /* file creation time */ struct timespec64 i_crtime; /* file creation time */
unsigned int fsflags; /* flags for FS_IOC_[SG]ETFLAGS */ unsigned int fsflags; /* flags for FS_IOC_[SG]ETFLAGS */
#ifdef CONFIG_TMPFS_QUOTA #ifdef CONFIG_TMPFS_QUOTA
struct dquot *i_dquot[MAXQUOTAS]; struct dquot __rcu *i_dquot[MAXQUOTAS];
#endif #endif
struct offset_ctx dir_offsets; /* stable entry offsets */ struct offset_ctx dir_offsets; /* stable entry offsets */
struct inode vfs_inode; struct inode vfs_inode;

2
mm/shmem.c
View file

@ -311,7 +311,7 @@ static void shmem_disable_quotas(struct super_block *sb)
dquot_quota_off(sb, type); 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; return SHMEM_I(inode)->i_dquot;
} }