diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
| commit | 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310 (patch) | |
| tree | 2e82b65c16a4aaa88eeb7dd9f47f2d1c418e77d0 /fs/ntfs/unistr.c | |
| parent | 3d9b1cdd2455017c6aa25bc2442092b81438981f (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/ntfs/unistr.c')
| -rw-r--r-- | fs/ntfs/unistr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c index 560b0ea255b0..19c42e231b44 100644 --- a/fs/ntfs/unistr.c +++ b/fs/ntfs/unistr.c @@ -264,7 +264,7 @@ int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins, /* We don't trust outside sources. */ if (ins) { - ucs = (ntfschar*)kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS); + ucs = kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS); if (ucs) { for (i = o = 0; i < ins_len; i += wc_len) { wc_len = nls->char2uni(ins + i, ins_len - i, |