Browse Source

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>
Pekka Enberg 20 years ago
parent
commit
2fb21db254
3 changed files with 4 additions and 4 deletions
  1. 1 0
      fs/ntfs/ChangeLog
  2. 2 3
      fs/ntfs/inode.c
  3. 1 1
      fs/ntfs/unistr.c

+ 1 - 0
fs/ntfs/ChangeLog

@@ -115,6 +115,7 @@ ToDo/Notes:
 	- Use NTFS_MAX_CLUSTER_SIZE in super.c instead of hard coding 0x10000.
 	- 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
 	- 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.
 	  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.
 2.1.22 - Many bug and race fixes and error handling improvements.
 
 

+ 2 - 3
fs/ntfs/inode.c

@@ -317,8 +317,7 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb)
 	ntfs_inode *ni;
 	ntfs_inode *ni;
 
 
 	ntfs_debug("Entering.");
 	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)) {
 	if (likely(ni != NULL)) {
 		ni->state = 0;
 		ni->state = 0;
 		return VFS_I(ni);
 		return VFS_I(ni);
@@ -343,7 +342,7 @@ static inline ntfs_inode *ntfs_alloc_extent_inode(void)
 	ntfs_inode *ni;
 	ntfs_inode *ni;
 
 
 	ntfs_debug("Entering.");
 	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)) {
 	if (likely(ni != NULL)) {
 		ni->state = 0;
 		ni->state = 0;
 		return ni;
 		return ni;

+ 1 - 1
fs/ntfs/unistr.c

@@ -264,7 +264,7 @@ int ntfs_nlstoucs(const ntfs_volume *vol, const char *ins,
 
 
 	/* We don't trust outside sources. */
 	/* We don't trust outside sources. */
 	if (ins) {
 	if (ins) {
-		ucs = (ntfschar*)kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS);
+		ucs = kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS);
 		if (ucs) {
 		if (ucs) {
 			for (i = o = 0; i < ins_len; i += wc_len) {
 			for (i = o = 0; i < ins_len; i += wc_len) {
 				wc_len = nls->char2uni(ins + i, ins_len - i,
 				wc_len = nls->char2uni(ins + i, ins_len - i,