[PATCH 4/4] squashfs: (void*)ify squashfs_read_data

[Jörn Engel]

Jörn

-- 
Anything that can go wrong, will.
-- Finagle's Law


Signed-off-by: Jörn Engel <joern@xxxxxxxxxxxxxxxxxxxx>
---

 fs/squashfs/inode.c    |   11 +++++------
 fs/squashfs/squashfs.h |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

--- linux-2.6.12-rc2cow/fs/squashfs/inode.c~squashfs_cu4	2005-04-20 16:40:47.498638704 +0200
+++ linux-2.6.12-rc2cow/fs/squashfs/inode.c	2005-04-20 22:44:04.723347592 +0200
@@ -172,7 +172,7 @@ static struct buffer_head *get_block_len
 }
 
 
-unsigned int squashfs_read_data(struct super_block *s, char *buffer,
+unsigned int squashfs_read_data(struct super_block *s, void *buffer,
 			unsigned int index, unsigned int length,
 			unsigned int *next_index)
 {
@@ -324,7 +324,6 @@ int squashfs_get_cached_block(struct sup
 			if (msBlk->block_cache[i].block ==
 							SQUASHFS_INVALID_BLK) {
 				if (!(msBlk->block_cache[i].data =
-						(unsigned char *)
 						kmalloc(SQUASHFS_METADATA_SIZE,
 						GFP_KERNEL))) {
 					ERROR("Failed to allocate cache"
@@ -854,7 +853,7 @@ static int squashfs_fill_super(struct su
 	init_waitqueue_head(&msBlk->waitq);
 	init_waitqueue_head(&msBlk->fragment_wait_queue);
 
-	if (!squashfs_read_data(s, (char *) sBlk, SQUASHFS_START,
+	if (!squashfs_read_data(s, sBlk, SQUASHFS_START,
 					sizeof(squashfs_super_block) |
 					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
 		SERROR("unable to read superblock\n");
@@ -955,7 +954,7 @@ static int squashfs_fill_super(struct su
 	if (msBlk->swap) {
 		squashfs_uid suid[sBlk->no_uids + sBlk->no_guids];
 
-		if (!squashfs_read_data(s, (char *) &suid, sBlk->uid_start,
+		if (!squashfs_read_data(s, &suid, sBlk->uid_start,
 					((sBlk->no_uids + sBlk->no_guids) *
 					 sizeof(squashfs_uid)) |
 					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
@@ -966,7 +965,7 @@ static int squashfs_fill_super(struct su
 		SQUASHFS_SWAP_DATA(msBlk->uid, suid, (sBlk->no_uids +
 			sBlk->no_guids), (sizeof(squashfs_uid) * 8));
 	} else
-		if (!squashfs_read_data(s, (char *) msBlk->uid, sBlk->uid_start,
+		if (!squashfs_read_data(s, msBlk->uid, sBlk->uid_start,
 					((sBlk->no_uids + sBlk->no_guids) *
 					 sizeof(squashfs_uid)) |
 					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) {
@@ -1001,7 +1000,7 @@ static int squashfs_fill_super(struct su
 	}
    
 	if (SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments) &&
-					!squashfs_read_data(s, (char *)
+					!squashfs_read_data(s,
 					msBlk->fragment_index,
 					sBlk->fragment_table_start,
 					SQUASHFS_FRAGMENT_INDEX_BYTES
--- linux-2.6.12-rc2cow/fs/squashfs/squashfs.h~squashfs_cu4	2005-04-20 16:37:15.900806464 +0200
+++ linux-2.6.12-rc2cow/fs/squashfs/squashfs.h	2005-04-20 22:42:45.917327928 +0200
@@ -37,7 +37,7 @@
 
 #define WARNING(s, args...)	printk(KERN_WARNING "SQUASHFS: "s, ## args)
 
-extern unsigned int squashfs_read_data(struct super_block *s, char *buffer,
+extern unsigned int squashfs_read_data(struct super_block *s, void *buffer,
 				unsigned int index, unsigned int length,
 				unsigned int *next_index);
 extern int squashfs_get_cached_block(struct super_block *s, void *buffer,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/