vfs: replace WARN(down_read_trylock, ...) abuse with proper asserts
PATCH 1/1 vfs: replace WARN(down_read_trylock, ...) abuse with proper asserts
Note the macro used here works regardless of LOCKDEP.
--- fs/dcache.c | 2 +- fs/quota/dquot.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-)
fs/dcache.c +1 -1
@@ -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 ;
fs/quota/dquot.c +2 -6
@@ -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)
Signature · 1 line
2.39.2
Quoted 3 lines · Mateusz Guzik
Note the macro used here works regardless of LOCKDEP.
Signed-off-by Mateusz Guzik <[email protected]>
Nice cleanup. Feel free to add:
Honza
Quoted 47 lines
--- fs/dcache.c | 2 +- fs/quota/dquot.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-)fs/dcache.c +1
-1@@ -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 ;fs/quota/dquot.c +2
-6@@ -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)Signature · 1 line
2.39.2
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 3 lines · Mateusz Guzik
Note the macro used here works regardless of LOCKDEP.
Applied to the vfs.misc branch of the vfs/vfs.git tree. Patches in the vfs.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.misc
[1/1] vfs: replace WARN(down_read_trylock, ...) abuse with proper asserts
https://git.kernel.org/vfs/vfs/c/43bcd0a6aa46