diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:41:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:41:47 -0700 |
| commit | 3e766fd41ddc31c47ec5b2840c6a45803d35ff40 (patch) | |
| tree | f007442f20757918aa024dda848baa7670baa580 /fs/fat/inode.c | |
| parent | 4fd5ec509bd486b5dd8cac1a4d4d7e2cbdf7c546 (diff) | |
| parent | 7845bc3e132605e3e8a1f37748e29281164b65f5 (diff) | |
| download | blackbird-op-linux-3e766fd41ddc31c47ec5b2840c6a45803d35ff40.tar.gz blackbird-op-linux-3e766fd41ddc31c47ec5b2840c6a45803d35ff40.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: convert to unlocked_ioctl
fat: Cleanup nls_unload() usage
fat: use pack_hex_byte() instead of custom one
Diffstat (limited to 'fs/fat/inode.c')
| -rw-r--r-- | fs/fat/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 0ce143bd7d56..c611818893b2 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1497,10 +1497,8 @@ out_fail: 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; |
