Messages in this thread Patch in this message | | | Date | Fri, 14 Aug 2009 12:42:44 -0000 | From | Thomas Gleixner <> | Subject | [patch 02/11] fat: cleanup fat_put_super() |
| |
unload_nls() can be called with a NULL pointer now. Remove the pointer checks and the NULLification of the pointers as the data structure which contains the pointers is kfree'd right away.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> --- fs/fat/inode.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
Index: linux-2.6-tip/fs/fat/inode.c =================================================================== --- linux-2.6-tip.orig/fs/fat/inode.c +++ linux-2.6-tip/fs/fat/inode.c @@ -470,19 +470,11 @@ static void fat_put_super(struct super_b 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);
| |