linux-next: build failure

[linux-2.6-omap-h63xx.git] / fs / befs / debug.c

diff --git a/fs/befs/debug.c b/fs/befs/debug.c
index bb68370f6494a68e1a5c5288ee8316a34c077acc..b8e304a0661e473ba7b44ca74ceebd3e8f228c52 100644 (file)
--- a/fs/befs/debug.c
+++ b/fs/befs/debug.c
@@ -28,7 +28,7 @@ void
 befs_error(const struct super_block *sb, const char *fmt, ...)
 {
        va_list args;
-       char *err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+       char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
        if (err_buf == NULL) {
                printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
                return;
@@ -46,7 +46,7 @@ void
 befs_warning(const struct super_block *sb, const char *fmt, ...)
 {
        va_list args;
-       char *err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+       char *err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
        if (err_buf == NULL) {
                printk(KERN_ERR "could not allocate %d bytes\n", ERRBUFSIZE);
                return;
@@ -70,7 +70,7 @@ befs_debug(const struct super_block *sb, const char *fmt, ...)
        char *err_buf = NULL;
 
        if (BEFS_SB(sb)->mount_opts.debug) {
-               err_buf = (char *) kmalloc(ERRBUFSIZE, GFP_KERNEL);
+               err_buf = kmalloc(ERRBUFSIZE, GFP_KERNEL);
                if (err_buf == NULL) {
                        printk(KERN_ERR "could not allocate %d bytes\n",
                                ERRBUFSIZE);
@@ -230,21 +230,20 @@ befs_dump_small_data(const struct super_block *sb, befs_small_data * sd)
 
 /* unused */
 void
-befs_dump_run(const struct super_block *sb, befs_block_run run)
+befs_dump_run(const struct super_block *sb, befs_disk_block_run run)
 {
 #ifdef CONFIG_BEFS_DEBUG
 
-       run = fsrun_to_cpu(sb, run);
+       befs_block_run n = fsrun_to_cpu(sb, run);
 
-       befs_debug(sb, "[%u, %hu, %hu]",
-                  run.allocation_group, run.start, run.len);
+       befs_debug(sb, "[%u, %hu, %hu]", n.allocation_group, n.start, n.len);
 
 #endif                         //CONFIG_BEFS_DEBUG
 }
 #endif  /*  0  */
 
 void
-befs_dump_index_entry(const struct super_block *sb, befs_btree_super * super)
+befs_dump_index_entry(const struct super_block *sb, befs_disk_btree_super * super)
 {
 #ifdef CONFIG_BEFS_DEBUG