summaryrefslogtreecommitdiff
path: root/fs/fat/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r--fs/fat/inode.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 854b578..0062da2 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -548,16 +548,6 @@ static void fat_set_state(struct super_block *sb,
brelse(bh);
}
-static void delayed_free(struct rcu_head *p)
-{
- struct msdos_sb_info *sbi = container_of(p, struct msdos_sb_info, rcu);
- unload_nls(sbi->nls_disk);
- unload_nls(sbi->nls_io);
- if (sbi->options.iocharset != fat_default_iocharset)
- kfree(sbi->options.iocharset);
- kfree(sbi);
-}
-
static void fat_put_super(struct super_block *sb)
{
struct msdos_sb_info *sbi = MSDOS_SB(sb);
@@ -567,7 +557,14 @@ static void fat_put_super(struct super_block *sb)
iput(sbi->fsinfo_inode);
iput(sbi->fat_inode);
- call_rcu(&sbi->rcu, delayed_free);
+ unload_nls(sbi->nls_disk);
+ unload_nls(sbi->nls_io);
+
+ if (sbi->options.iocharset != fat_default_iocharset)
+ kfree(sbi->options.iocharset);
+
+ sb->s_fs_info = NULL;
+ kfree(sbi);
}
static struct kmem_cache *fat_inode_cachep;