From: Pavel Machek <pavel@ucw.cz>
This fixes codingstyle a bit, converts "can not happen" panic into BUG_ON
(fill_suspend_header() allocates no memory so panic is meaningless) and
adds check for sizeof (struct link) [if that is not PAGE_SIZE, we have
*bad* problem, better check early].
---
kernel/power/swsusp.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff -puN kernel/power/swsusp.c~swsusp-more-cleanups kernel/power/swsusp.c
--- 25/kernel/power/swsusp.c~swsusp-more-cleanups 2004-01-20 21:28:50.000000000 -0800
+++ 25-akpm/kernel/power/swsusp.c 2004-01-20 21:28:50.000000000 -0800
@@ -341,6 +341,7 @@ static int write_suspend_image(void)
printk("H");
BUG_ON (sizeof(struct suspend_header) > PAGE_SIZE-sizeof(swp_entry_t));
BUG_ON (sizeof(union diskpage) != PAGE_SIZE);
+ BUG_ON (sizeof(struct link) != PAGE_SIZE);
if (!(entry = get_swap_page()).val)
panic( "\nNot enough swapspace when writing header" );
if (swapfile_used[swp_type(entry)] != SWAPFILE_SUSPEND)
@@ -838,23 +839,23 @@ static int relocate_pagedir(void)
static int sanity_check_failed(char *reason)
{
- printk(KERN_ERR "%s%s\n",name_resume,reason);
+ printk(KERN_ERR "%s%s\n", name_resume, reason);
return -EPERM;
}
static int sanity_check(struct suspend_header *sh)
{
- if(sh->version_code != LINUX_VERSION_CODE)
+ if (sh->version_code != LINUX_VERSION_CODE)
return sanity_check_failed("Incorrect kernel version");
- if(sh->num_physpages != num_physpages)
+ if (sh->num_physpages != num_physpages)
return sanity_check_failed("Incorrect memory size");
- if(strncmp(sh->machine, system_utsname.machine, 8))
+ if (strncmp(sh->machine, system_utsname.machine, 8))
return sanity_check_failed("Incorrect machine type");
- if(strncmp(sh->version, system_utsname.version, 20))
+ if (strncmp(sh->version, system_utsname.version, 20))
return sanity_check_failed("Incorrect version");
- if(sh->num_cpus != num_online_cpus())
+ if (sh->num_cpus != num_online_cpus())
return sanity_check_failed("Incorrect number of cpus");
- if(sh->page_size != PAGE_SIZE)
+ if (sh->page_size != PAGE_SIZE)
return sanity_check_failed("Incorrect PAGE_SIZE");
return 0;
}
_