fat: rcu-delay unloading nls and freeing sbi

[~andy/linux] / fs / fat / inode.c

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 11b51bb55b42b03187fc8436125e986c0cdcc047..854b578f6695eae6e0ef25d7af4dcdc8546d6044 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -147,7 +147,7 @@ static void fat_write_failed(struct address_space *mapping, loff_t to)
        struct inode *inode = mapping->host;
 
        if (to > inode->i_size) {
-               truncate_pagecache(inode, to, inode->i_size);
+               truncate_pagecache(inode, inode->i_size);
                fat_truncate_blocks(inode, inode->i_size);
        }
 }
@@ -548,6 +548,16 @@ 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);
@@ -557,14 +567,7 @@ static void fat_put_super(struct super_block *sb)
        iput(sbi->fsinfo_inode);
        iput(sbi->fat_inode);
 
-       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);
+       call_rcu(&sbi->rcu, delayed_free);
 }
 
 static struct kmem_cache *fat_inode_cachep;