author: Thomas Gleixner <tglx@linutronix.de> 2009-08-16 21:05:08 +0000
committer: Al Viro <viro@zeniv.linux.org.uk> 2009-09-24 07:47:42 -0400
commit: 6d729e44a55547c009d7a87ea66bff21a8e0afea
parent: 4504230a71566785a05d3e6b53fa1ee071b864eb
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 12 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 8970d8c49bb0..04629d1302fc 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -470,19 +470,11 @@ static void fat_put_super(struct super_block *sb)
iput(sbi->fat_inode);
- if (sbi->nls_disk) {
- unload_nls(sbi->nls_disk);
- sbi->nls_disk = NULL;
- sbi->options.codepage = fat_default_codepage;
- }
- if (sbi->nls_io) {
- unload_nls(sbi->nls_io);
- sbi->nls_io = NULL;
- }
- if (sbi->options.iocharset != fat_default_iocharset) {
+ unload_nls(sbi->nls_disk);
+ unload_nls(sbi->nls_io);
+
+ if (sbi->options.iocharset != fat_default_iocharset)
kfree(sbi->options.iocharset);
- sbi->options.iocharset = fat_default_iocharset;
- }
sb->s_fs_info = NULL;
kfree(sbi);