From c5d9cdd8ba9f2df519af38fba6ad467e05b539a2 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Tue, 16 Mar 2010 05:48:09 +0900 Subject: [PATCH] --- yaml --- r: 198107 b: refs/heads/master c: 1bdb6f9199def1c3538c18089e499f5df5ff1747 h: refs/heads/master i: 198105: 1bc4262c21c12cc3cc3d6c2caeb77fc45c126c11 198103: d04d1269f325b317e3373afc453f9b49d90295b6 v: v3 --- [refs] | 2 +- trunk/fs/fat/inode.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa322f5de89b..e4a61d92911a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ed3dec1568d1232fcfb2aa8c5f9e3f38940c9d8 +refs/heads/master: 1bdb6f9199def1c3538c18089e499f5df5ff1747 diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c index 0ce143bd7d56..c611818893b2 100644 --- a/trunk/fs/fat/inode.c +++ b/trunk/fs/fat/inode.c @@ -1497,10 +1497,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, iput(fat_inode); if (root_inode) iput(root_inode); - if (sbi->nls_io) - unload_nls(sbi->nls_io); - if (sbi->nls_disk) - unload_nls(sbi->nls_disk); + unload_nls(sbi->nls_io); + unload_nls(sbi->nls_disk); if (sbi->options.iocharset != fat_default_iocharset) kfree(sbi->options.iocharset); sb->s_fs_info = NULL;