summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-08-02 13:54:39 +0200
committerJan Kara <jack@suse.cz>2023-08-03 12:00:26 +0200
commit7a64774add85ce673a089810fae193b02003be24 (patch)
treed36e9f815c26c5224beec66d07c4fbb041fc320a
parent2363650b22ed3c8bbe7700789e399a77096ac931 (diff)
downloadlinux-7a64774add85ce673a089810fae193b02003be24.tar.gz
linux-7a64774add85ce673a089810fae193b02003be24.tar.bz2
linux-7a64774add85ce673a089810fae193b02003be24.zip
quota: use lockdep_assert_held_write in dquot_load_quota_sb
Use lockdep_assert_held_write to assert and self-document the locking state in dquot_load_quota_sb instead of hand-crafting it with a trylock. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz> Message-Id: <20230802115439.2145212-2-hch@lst.de>
-rw-r--r--fs/quota/dquot.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index e8232242dd34..303632f7948f 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2365,11 +2365,10 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,
struct quota_info *dqopt = sb_dqopt(sb);
int error;
+ lockdep_assert_held_write(&sb->s_umount);
+
/* Just unsuspend quotas? */
BUG_ON(flags & DQUOT_SUSPENDED);
- /* s_umount should be held in exclusive mode */
- if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount)))
- up_read(&sb->s_umount);
if (!fmt)
return -ESRCH;