]> git.itanic.dy.fi Git - linux-stable/commit
ext4: inline jbd2_journal_[un]register_shrinker()
authorTheodore Ts'o <tytso@mit.edu>
Fri, 2 Jul 2021 22:05:03 +0000 (18:05 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 8 Jul 2021 12:37:31 +0000 (08:37 -0400)
commit0705e8d1e2207ceeb83dc6e1751b6b82718b353a
treead76dc000bf4c60ff87900c29ae161661c086c8d
parent0955901908e80384592ed85aa164d7e5be6cc067
ext4: inline jbd2_journal_[un]register_shrinker()

The function jbd2_journal_unregister_shrinker() was getting called
twice when the file system was getting unmounted.  On Power and ARM
platforms this was causing kernel crash when unmounting the file
system, when a percpu_counter was destroyed twice.

Fix this by removing jbd2_journal_[un]register_shrinker() functions,
and inlining the shrinker setup and teardown into
journal_init_common() and jbd2_journal_destroy().  This means that
ext4 and ocfs2 now no longer need to know about registering and
unregistering jbd2's shrinker.

Also, while we're at it, rename the percpu counter from
j_jh_shrink_count to j_checkpoint_jh_count, since this makes it
clearer what this counter is intended to track.

Link: https://lore.kernel.org/r/20210705145025.3363130-1-tytso@mit.edu
Fixes: 4ba3fcdde7e3 ("jbd2,ext4: add a shrinker to release checkpointed buffers")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/super.c
fs/jbd2/checkpoint.c
fs/jbd2/journal.c
include/linux/jbd2.h