diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
| commit | 076fb01e8238b7e5d68ba0d729c0ff7716d1d8ec (patch) | |
| tree | abcaefe016870427ed289748cb0b936575d60593 /fs/ntfs/unistr.c | |
| parent | 4c48b0d3d1c7ff9f13134b30e41c6e81a92027bf (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 560b0ea255b..19c42e231b4 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, |