diff options
| -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: | |||
| 115 | - Use NTFS_MAX_CLUSTER_SIZE in super.c instead of hard coding 0x10000. | 115 | - Use NTFS_MAX_CLUSTER_SIZE in super.c instead of hard coding 0x10000. |
| 116 | - Use MAX_BUF_PER_PAGE instead of variable sized array allocation for | 116 | - Use MAX_BUF_PER_PAGE instead of variable sized array allocation for |
| 117 | better code generation and one less sparse warning in fs/ntfs/aops.c. | 117 | better code generation and one less sparse warning in fs/ntfs/aops.c. |
| 118 | - Remove spurious void pointer casts from fs/ntfs/. (Pekka Enberg) | ||
| 118 | 119 | ||
| 119 | 2.1.22 - Many bug and race fixes and error handling improvements. | 120 | 2.1.22 - Many bug and race fixes and error handling improvements. |
| 120 | 121 | ||
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) | |||
| 317 | ntfs_inode *ni; | 317 | ntfs_inode *ni; |
| 318 | 318 | ||
| 319 | ntfs_debug("Entering."); | 319 | ntfs_debug("Entering."); |
| 320 | ni = (ntfs_inode *)kmem_cache_alloc(ntfs_big_inode_cache, | 320 | ni = kmem_cache_alloc(ntfs_big_inode_cache, SLAB_NOFS); |
| 321 | SLAB_NOFS); | ||
| 322 | if (likely(ni != NULL)) { | 321 | if (likely(ni != NULL)) { |
| 323 | ni->state = 0; | 322 | ni->state = 0; |
| 324 | return VFS_I(ni); | 323 | return VFS_I(ni); |
| @@ -343,7 +342,7 @@ static inline ntfs_inode *ntfs_alloc_extent_inode(void) | |||
| 343 | ntfs_inode *ni; | 342 | ntfs_inode *ni; |
| 344 | 343 | ||
| 345 | ntfs_debug("Entering."); | 344 | ntfs_debug("Entering."); |
| 346 | ni = (ntfs_inode *)kmem_cache_alloc(ntfs_inode_cache, SLAB_NOFS); | 345 | ni = kmem_cache_alloc(ntfs_inode_cache, SLAB_NOFS); |
| 347 | if (likely(ni != NULL)) { | 346 | if (likely(ni != NULL)) { |
| 348 | ni->state = 0; | 347 | ni->state = 0; |
| 349 | return ni; | 348 | 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, | |||
| 264 | 264 | ||
| 265 | /* We don't trust outside sources. */ | 265 | /* We don't trust outside sources. */ |
| 266 | if (ins) { | 266 | if (ins) { |
| 267 | ucs = (ntfschar*)kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS); | 267 | ucs = kmem_cache_alloc(ntfs_name_cache, SLAB_NOFS); |
| 268 | if (ucs) { | 268 | if (ucs) { |
| 269 | for (i = o = 0; i < ins_len; i += wc_len) { | 269 | for (i = o = 0; i < ins_len; i += wc_len) { |
| 270 | wc_len = nls->char2uni(ins + i, ins_len - i, | 270 | wc_len = nls->char2uni(ins + i, ins_len - i, |
