mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[PATCH] fs: Removing useless casts
* Removing useless casts * Removing useless wrapper * Conversion from kmalloc+memset to kzalloc Signed-off-by: Panagiotis Issaris <[email protected]> Acked-by: Dave Kleikamp <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
f8314dc60c
commit
f52720ca5f
21 changed files with 37 additions and 48 deletions
|
|
@ -1149,8 +1149,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|||
* Allocate a buffer to store the current name being processed
|
||||
* converted to format determined by current NLS.
|
||||
*/
|
||||
name = (u8*)kmalloc(NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1,
|
||||
GFP_NOFS);
|
||||
name = kmalloc(NTFS_MAX_NAME_LEN * NLS_MAX_CHARSET_SIZE + 1, GFP_NOFS);
|
||||
if (unlikely(!name)) {
|
||||
err = -ENOMEM;
|
||||
goto err_out;
|
||||
|
|
@ -1191,7 +1190,7 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|||
* map the mft record without deadlocking.
|
||||
*/
|
||||
rc = le32_to_cpu(ctx->attr->data.resident.value_length);
|
||||
ir = (INDEX_ROOT*)kmalloc(rc, GFP_NOFS);
|
||||
ir = kmalloc(rc, GFP_NOFS);
|
||||
if (unlikely(!ir)) {
|
||||
err = -ENOMEM;
|
||||
goto err_out;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ static int ntfs_init_locked_inode(struct inode *vi, ntfs_attr *na)
|
|||
|
||||
BUG_ON(!na->name);
|
||||
i = na->name_len * sizeof(ntfschar);
|
||||
ni->name = (ntfschar*)kmalloc(i + sizeof(ntfschar), GFP_ATOMIC);
|
||||
ni->name = kmalloc(i + sizeof(ntfschar), GFP_ATOMIC);
|
||||
if (!ni->name)
|
||||
return -ENOMEM;
|
||||
memcpy(ni->name, na->name, i);
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ map_err_out:
|
|||
ntfs_inode **tmp;
|
||||
int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode *);
|
||||
|
||||
tmp = (ntfs_inode **)kmalloc(new_size, GFP_NOFS);
|
||||
tmp = kmalloc(new_size, GFP_NOFS);
|
||||
if (unlikely(!tmp)) {
|
||||
ntfs_error(base_ni->vol->sb, "Failed to allocate "
|
||||
"internal buffer.");
|
||||
|
|
@ -2893,7 +2893,7 @@ rollback:
|
|||
if (!(base_ni->nr_extents & 3)) {
|
||||
int new_size = (base_ni->nr_extents + 4) * sizeof(ntfs_inode*);
|
||||
|
||||
extent_nis = (ntfs_inode**)kmalloc(new_size, GFP_NOFS);
|
||||
extent_nis = kmalloc(new_size, GFP_NOFS);
|
||||
if (unlikely(!extent_nis)) {
|
||||
ntfs_error(vol->sb, "Failed to allocate internal "
|
||||
"buffer during rollback.%s", es);
|
||||
|
|
|
|||
|
|
@ -350,7 +350,7 @@ int ntfs_ucstonls(const ntfs_volume *vol, const ntfschar *ins,
|
|||
}
|
||||
if (!ns) {
|
||||
ns_len = ins_len * NLS_MAX_CHARSET_SIZE;
|
||||
ns = (unsigned char*)kmalloc(ns_len + 1, GFP_NOFS);
|
||||
ns = kmalloc(ns_len + 1, GFP_NOFS);
|
||||
if (!ns)
|
||||
goto mem_err_out;
|
||||
}
|
||||
|
|
@ -365,7 +365,7 @@ retry: wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o,
|
|||
else if (wc == -ENAMETOOLONG && ns != *outs) {
|
||||
unsigned char *tc;
|
||||
/* Grow in multiples of 64 bytes. */
|
||||
tc = (unsigned char*)kmalloc((ns_len + 64) &
|
||||
tc = kmalloc((ns_len + 64) &
|
||||
~63, GFP_NOFS);
|
||||
if (tc) {
|
||||
memcpy(tc, ns, ns_len);
|
||||
|
|
|
|||
Loading…
Reference in a new issue