lkml.org 
[lkml]   [2009]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 07/11] isofs: cleanup unload_nls() calls
    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>
    ---
    fs/isofs/inode.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    Index: linux-2.6-tip/fs/isofs/inode.c
    ===================================================================
    --- linux-2.6-tip.orig/fs/isofs/inode.c
    +++ linux-2.6-tip/fs/isofs/inode.c
    @@ -46,10 +46,7 @@ static void isofs_put_super(struct super
    #ifdef CONFIG_JOLIET
    lock_kernel();

    - if (sbi->s_nls_iocharset) {
    - unload_nls(sbi->s_nls_iocharset);
    - sbi->s_nls_iocharset = NULL;
    - }
    + unload_nls(sbi->s_nls_iocharset);

    unlock_kernel();
    #endif
    @@ -912,8 +909,7 @@ out_no_root:
    printk(KERN_WARNING "%s: get root inode failed\n", __func__);
    out_no_inode:
    #ifdef CONFIG_JOLIET
    - if (sbi->s_nls_iocharset)
    - unload_nls(sbi->s_nls_iocharset);
    + unload_nls(sbi->s_nls_iocharset);
    #endif
    goto out_freesbi;
    out_no_read:



    \
     
     \ /
      Last update: 2009-08-14 14:47    [W:0.022 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site