diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-09-27 04:49:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:10 -0400 |
commit | f52720ca5f48574e347dff35ffe6b389ace61537 (patch) | |
tree | 7efc8ec6bad32b98e406a5c553149d57e46bd07e /fs/xfs/linux-2.6 | |
parent | f8314dc60ccba7e41f425048c4160dc7f63377d5 (diff) |
[PATCH] fs: Removing useless casts
* Removing useless casts
* Removing useless wrapper
* Conversion from kmalloc+memset to kzalloc
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Acked-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 2 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 3d4f6dff2113..41cfcba7ce49 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
@@ -370,7 +370,7 @@ xfs_file_readdir( | |||
370 | 370 | ||
371 | /* Try fairly hard to get memory */ | 371 | /* Try fairly hard to get memory */ |
372 | do { | 372 | do { |
373 | if ((read_buf = (caddr_t)kmalloc(rlen, GFP_KERNEL))) | 373 | if ((read_buf = kmalloc(rlen, GFP_KERNEL))) |
374 | break; | 374 | break; |
375 | rlen >>= 1; | 375 | rlen >>= 1; |
376 | } while (rlen >= 1024); | 376 | } while (rlen >= 1024); |
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index d9180020de63..22e3b714f629 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -553,13 +553,13 @@ xfs_vn_follow_link( | |||
553 | ASSERT(dentry); | 553 | ASSERT(dentry); |
554 | ASSERT(nd); | 554 | ASSERT(nd); |
555 | 555 | ||
556 | link = (char *)kmalloc(MAXPATHLEN+1, GFP_KERNEL); | 556 | link = kmalloc(MAXPATHLEN+1, GFP_KERNEL); |
557 | if (!link) { | 557 | if (!link) { |
558 | nd_set_link(nd, ERR_PTR(-ENOMEM)); | 558 | nd_set_link(nd, ERR_PTR(-ENOMEM)); |
559 | return NULL; | 559 | return NULL; |
560 | } | 560 | } |
561 | 561 | ||
562 | uio = (uio_t *)kmalloc(sizeof(uio_t), GFP_KERNEL); | 562 | uio = kmalloc(sizeof(uio_t), GFP_KERNEL); |
563 | if (!uio) { | 563 | if (!uio) { |
564 | kfree(link); | 564 | kfree(link); |
565 | nd_set_link(nd, ERR_PTR(-ENOMEM)); | 565 | nd_set_link(nd, ERR_PTR(-ENOMEM)); |