On Thu, Mar 25, 2021 at 05:38:08AM +0530, Shreeya Patel wrote: > utf8_unload is being called if CONFIG_UNICODE is enabled. > The ifdef block doesn't check if utf8 encoding has been loaded > or not before calling the utf8_unload() function. > This is not the expected behavior since it would sometimes lead > to unloading utf8 even before loading it. > Hence, add a condition which will check if sb->encoding is NOT NULL > before calling the utf8_unload(). > > Reviewed-by: Gabriel Krisman Bertazi <kris...@collabora.com> > Signed-off-by: Shreeya Patel <shreeya.pa...@collabora.com> > --- > fs/ext4/super.c | 6 ++++-- > fs/f2fs/super.c | 9 ++++++--- > 2 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index ad34a37278cd..e438d14f9a87 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1259,7 +1259,8 @@ static void ext4_put_super(struct super_block *sb) > fs_put_dax(sbi->s_daxdev); > fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy); > #ifdef CONFIG_UNICODE > - utf8_unload(sb->s_encoding); > + if (sb->s_encoding) > + utf8_unload(sb->s_encoding); > #endif > kfree(sbi); > }
What's the benefit of this change? utf8_unload is a no-op when passed a NULL pointer; why not keep it that way? - Eric
