diff options
| author | Eric Biggers <[email protected]> | 2022-11-06 22:48:36 +0000 |
|---|---|---|
| committer | Theodore Ts'o <[email protected]> | 2022-12-09 02:49:24 +0000 |
| commit | 4c0d5778385cb3618ff26a561ce41de2b7d9de70 (patch) | |
| tree | e0b19c2cd3051719842588445a2f8cedd4076921 /fs/ext4/fast_commit.c | |
| parent | ext4: disable fast-commit of encrypted dir operations (diff) | |
| download | kernel-4c0d5778385cb3618ff26a561ce41de2b7d9de70.tar.gz kernel-4c0d5778385cb3618ff26a561ce41de2b7d9de70.zip | |
ext4: don't set up encryption key during jbd2 transaction
Commit a80f7fcf1867 ("ext4: fixup ext4_fc_track_* functions' signature")
extended the scope of the transaction in ext4_unlink() too far, making
it include the call to ext4_find_entry(). However, ext4_find_entry()
can deadlock when called from within a transaction because it may need
to set up the directory's encryption key.
Fix this by restoring the transaction to its original scope.
Reported-by: [email protected]
Fixes: a80f7fcf1867 ("ext4: fixup ext4_fc_track_* functions' signature")
Cc: <[email protected]> # v5.10+
Signed-off-by: Eric Biggers <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>
Diffstat (limited to 'fs/ext4/fast_commit.c')
| -rw-r--r-- | fs/ext4/fast_commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 6d98f2b39b77..da0c8228cf9c 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1397,7 +1397,7 @@ static int ext4_fc_replay_unlink(struct super_block *sb, struct ext4_fc_tl *tl, return 0; } - ret = __ext4_unlink(NULL, old_parent, &entry, inode); + ret = __ext4_unlink(old_parent, &entry, inode, NULL); /* -ENOENT ok coz it might not exist anymore. */ if (ret == -ENOENT) ret = 0; |