diff options
| author | Mateusz Guzik <mjguzik@gmail.com> | 2024-06-02 14:37:19 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-06-03 15:45:47 +0200 |
| commit | 54018131e663a1df05021fcb22a18d6c5ebef734 (patch) | |
| tree | bdece4a7a68ca7e941b0e5c63112855b5c2cf637 | |
| parent | 620c266f394932e5decc4b34683a75dfc59dc2f4 (diff) | |
vfs: replace WARN(down_read_trylock, ...) abuse with proper asserts
Note the macro used here works regardless of LOCKDEP.
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Link: https://lore.kernel.org/r/20240602123720.775702-1-mjguzik@gmail.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/dcache.c | 2 | ||||
| -rw-r--r-- | fs/quota/dquot.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 1ee6404b430b..58b89c9e9b0c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1548,7 +1548,7 @@ void shrink_dcache_for_umount(struct super_block *sb) { struct dentry *dentry; - WARN(down_read_trylock(&sb->s_umount), "s_umount should've been locked"); + rwsem_assert_held_write(&sb->s_umount); dentry = sb->s_root; sb->s_root = NULL; diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 627eb2f72ef3..a2b256dac36e 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -2246,9 +2246,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) int cnt; struct quota_info *dqopt = sb_dqopt(sb); - /* s_umount should be held in exclusive mode */ - if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount))) - up_read(&sb->s_umount); + rwsem_assert_held_write(&sb->s_umount); /* Cannot turn off usage accounting without turning off limits, or * suspend quotas and simultaneously turn quotas off. */ @@ -2510,9 +2508,7 @@ int dquot_resume(struct super_block *sb, int type) int ret = 0, cnt; unsigned int flags; - /* s_umount should be held in exclusive mode */ - if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount))) - up_read(&sb->s_umount); + rwsem_assert_held_write(&sb->s_umount); for (cnt = 0; cnt < MAXQUOTAS; cnt++) { if (type != -1 && cnt != type) |