diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-05-25 22:15:34 +0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-27 19:00:53 +0400 |
| commit | 2fb21db2548fc8b196eb8d8425f05ee1965d5344 (patch) | |
| tree | b319e97bfb3e50bcde9a82cf089d86a7dcb03df5 | |
| parent | 5eac51462f340b7c4a03b9220cf157c40b4990a5 (diff) | |
| download | linux-2fb21db2548fc8b196eb8d8425f05ee1965d5344.tar.xz | |
NTFS: Remove spurious void pointer casts from fs/ntfs/.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
| -rw-r--r-- | fs/ntfs/ChangeLog | 1 | ||||
| -rw-r--r-- | fs/ntfs/inode.c | 5 | ||||
| -rw-r--r-- | fs/ntfs/unistr.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index 7f7eec58fee2..f8ba90dd8e39 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog @@ -115,6 +115,7 @@ ToDo/Notes: - Use NTFS_MAX_CLUSTER_SIZE in super.c instead of hard coding 0x10000. - Use MAX_BUF_PER_PAGE instead of variable sized array allocation for better code generation and one less sparse warning in fs/ntfs/aops.c. + - Remove spurious void pointer casts from fs/ntfs/. (Pekka Enberg) 2.1.22 - Many bug and race fixes and error handling improvements. diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index f7bee8d014d9..886214a77f90 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -317,8 +317,7 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb) ntfs_inode *ni; ntfs_debug("Entering."); - ni = (ntfs_inode *)kmem_cache_alloc(ntfs_big_inode_cache, - SLAB_NOFS); + ni = kmem_cache_alloc(ntfs_big_inode_cache, SLAB_NOFS); if (likely(ni != NULL)) { ni->state = 0; return VFS_I(ni); @@ -343,7 +342,7 @@ static inline ntfs_inode *ntfs_alloc_extent_inode(void) ntfs_inode *ni; ntfs_debug("Entering."); - ni = (ntfs_inode *)kmem_cache_alloc(ntfs_inode_cache, SLAB_NOFS); + ni = kmem_cache_alloc(ntfs_inode_cache, SLAB_NOFS); if (likely(ni != NULL)) { ni->state = 0; return ni; 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, |