Commit 730663b8 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] compile warnings

	fixes warnings in acct.h and do_mounts.c
parent 4113dcbd
...@@ -76,6 +76,7 @@ struct acct ...@@ -76,6 +76,7 @@ struct acct
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_BSD_PROCESS_ACCT #ifdef CONFIG_BSD_PROCESS_ACCT
struct super_block;
extern void acct_auto_close(struct super_block *sb); extern void acct_auto_close(struct super_block *sb);
extern int acct_process(long exitcode); extern int acct_process(long exitcode);
#else #else
......
...@@ -597,7 +597,7 @@ static int __init rd_load_image(char *from) ...@@ -597,7 +597,7 @@ static int __init rd_load_image(char *from)
#ifdef CONFIG_BLK_DEV_RAM #ifdef CONFIG_BLK_DEV_RAM
int in_fd, out_fd; int in_fd, out_fd;
unsigned long rd_blocks, devblocks; unsigned long rd_blocks, devblocks;
int nblocks, i; int nblocks, i, disk;
char *buf; char *buf;
unsigned short rotate = 0; unsigned short rotate = 0;
#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES)
...@@ -640,7 +640,7 @@ static int __init rd_load_image(char *from) ...@@ -640,7 +640,7 @@ static int __init rd_load_image(char *from)
rd_blocks >>= 1; rd_blocks >>= 1;
if (nblocks > rd_blocks) { if (nblocks > rd_blocks) {
printk("RAMDISK: image too big! (%d/%d blocks)\n", printk("RAMDISK: image too big! (%d/%ld blocks)\n",
nblocks, rd_blocks); nblocks, rd_blocks);
goto done; goto done;
} }
...@@ -667,23 +667,23 @@ static int __init rd_load_image(char *from) ...@@ -667,23 +667,23 @@ static int __init rd_load_image(char *from)
goto done; goto done;
} }
printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%d disk%s] into ram disk... ", printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%ld disk%s] into ram disk... ",
nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : ""); nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");
for (i=0; i < nblocks; i++) { for (i = 0, disk = 1; i < nblocks; i++) {
if (i && (i % devblocks == 0)) { if (i && (i % devblocks == 0)) {
printk("done disk #%d.\n", i/devblocks); printk("done disk #%d.\n", disk++);
rotate = 0; rotate = 0;
if (close(in_fd)) { if (close(in_fd)) {
printk("Error closing the disk.\n"); printk("Error closing the disk.\n");
goto noclose_input; goto noclose_input;
} }
change_floppy("disk #%d", i/devblocks+1); change_floppy("disk #%d", disk);
in_fd = open(from, O_RDONLY, 0); in_fd = open(from, O_RDONLY, 0);
if (in_fd < 0) { if (in_fd < 0) {
printk("Error opening disk.\n"); printk("Error opening disk.\n");
goto noclose_input; goto noclose_input;
} }
printk("Loading disk #%d... ", i/devblocks+1); printk("Loading disk #%d... ", disk);
} }
read(in_fd, buf, BLOCK_SIZE); read(in_fd, buf, BLOCK_SIZE);
write(out_fd, buf, BLOCK_SIZE); write(out_fd, buf, BLOCK_SIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment