diff options
| author |   Ojaswin Mujoo <ojaswin@linux.ibm.com> | 2024-11-21 18:08:55 +0530 |
|---|---|---|
| committer |   Theodore Ts'o <tytso@mit.edu> | 2025-03-05 22:12:27 -0500 |
| commit | 530fea29ef82e169cd7fe048c2b7baaeb85a0028 (patch) | |
| tree | 1679eccb56d06782855a529b28fd851808adf9cc | |
| parent | ext4: introduce linear search for dentries (diff) | |
| download | wireguard-linux-530fea29ef82e169cd7fe048c2b7baaeb85a0028.tar.xz wireguard-linux-530fea29ef82e169cd7fe048c2b7baaeb85a0028.zip | |
ext4: protect ext4_release_dquot against freezing
Protect ext4_release_dquot against freezing so that we
don't try to start a transaction when FS is frozen, leading
to warnings.
Further, avoid taking the freeze protection if a transaction
is already running so that we don't need end up in a deadlock
as described in
46e294efc355 ext4: fix deadlock with fs freezing and EA inodes
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Reviewed-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20241121123855.645335-3-ojaswin@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to '')
| -rw-r--r-- | fs/ext4/super.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a963ffda692a..7ba5ef80d502 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6920,12 +6920,25 @@ static int ext4_release_dquot(struct dquot *dquot) { int ret, err; handle_t *handle; + bool freeze_protected = false; + + /* + * Trying to sb_start_intwrite() in a running transaction + * can result in a deadlock. Further, running transactions + * are already protected from freezing. + */ + if (!ext4_journal_current_handle()) { + sb_start_intwrite(dquot->dq_sb); + freeze_protected = true; + } handle = ext4_journal_start(dquot_to_inode(dquot), EXT4_HT_QUOTA, EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb)); if (IS_ERR(handle)) { /* Release dquot anyway to avoid endless cycle in dqput() */ dquot_release(dquot); + if (freeze_protected) + sb_end_intwrite(dquot->dq_sb); return PTR_ERR(handle); } ret = dquot_release(dquot); @@ -6936,6 +6949,10 @@ static int ext4_release_dquot(struct dquot *dquot) err = ext4_journal_stop(handle); if (!ret) ret = err; + + if (freeze_protected) + sb_end_intwrite(dquot->dq_sb); + return ret; } |