From 02ef85b00d5d4b99e9a6b04f32d11d41406ff763 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 25 May 2005 21:15:34 +0300 Subject: [PATCH] --- yaml --- r: 4869 b: refs/heads/master c: 2fb21db2548fc8b196eb8d8425f05ee1965d5344 h: refs/heads/master i: 4867: dabba7135a5c6c9567b57f0b3c5cded4e3865833 v: v3 --- [refs] | 2 +- trunk/fs/ntfs/ChangeLog | 1 + trunk/fs/ntfs/inode.c | 5 ++--- trunk/fs/ntfs/unistr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 195d4a5566fb..021b21a8f122 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eac51462f340b7c4a03b9220cf157c40b4990a5 +refs/heads/master: 2fb21db2548fc8b196eb8d8425f05ee1965d5344 diff --git a/trunk/fs/ntfs/ChangeLog b/trunk/fs/ntfs/ChangeLog index 7f7eec58fee2..f8ba90dd8e39 100644 --- a/trunk/fs/ntfs/ChangeLog +++ b/trunk/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/trunk/fs/ntfs/inode.c b/trunk/fs/ntfs/inode.c index f7bee8d014d9..886214a77f90 100644 --- a/trunk/fs/ntfs/inode.c +++ b/trunk/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/trunk/fs/ntfs/unistr.c b/trunk/fs/ntfs/unistr.c index 560b0ea255b0..19c42e231b44 100644 --- a/trunk/fs/ntfs/unistr.c +++ b/trunk/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,