Merge /spare/repo/linux-2.6/

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
index 217e32f37e0b..0a473f79c89f 100644
--- a/fs/hfs/mdb.c
+++ b/fs/hfs/mdb.c
@@ -10,6 +10,7 @@
 
 #include <linux/cdrom.h>
 #include <linux/genhd.h>
+#include <linux/nls.h>
 
 #include "hfs_fs.h"
 #include "btree.h"
@@ -343,6 +344,11 @@ void hfs_mdb_put(struct super_block *sb)
         brelse(HFS_SB(sb)->mdb_bh);
         brelse(HFS_SB(sb)->alt_mdb_bh);
 
+        if (HFS_SB(sb)->nls_io)
+                unload_nls(HFS_SB(sb)->nls_io);
+        if (HFS_SB(sb)->nls_disk)
+                unload_nls(HFS_SB(sb)->nls_disk);
+
         kfree(HFS_SB(sb));
         sb->s_fs_info = NULL;
 }