diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-01-05 15:34:11 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-05 15:34:11 -0800 |
| commit | 4aea86b4033f92f01547e6d4388d4451ae9b0980 (patch) | |
| tree | 1e6e70b8133187b56d636ad9bb942c81b2654173 /fs/ext4/super.c | |
| parent | 0471005efac9ac70bffd50532f8de07a28eac5aa (diff) | |
| parent | 50011c32f421215f6231996fcc84fd1fe81c4a48 (diff) | |
| download | linux-4aea86b4033f92f01547e6d4388d4451ae9b0980.tar.gz linux-4aea86b4033f92f01547e6d4388d4451ae9b0980.tar.bz2 linux-4aea86b4033f92f01547e6d4388d4451ae9b0980.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 16a343e8047d..260c1b3e3ef2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1225,7 +1225,7 @@ static void ext4_put_super(struct super_block *sb) } ext4_es_unregister_shrinker(sbi); - del_timer_sync(&sbi->s_err_report); + timer_shutdown_sync(&sbi->s_err_report); ext4_release_system_zone(sb); ext4_mb_release(sb); ext4_ext_release(sb); |