From: Pavel Machek <pavel@ucw.cz>
To: Rusty trivial patch monkey Russell <trivial@rustcorp.com.au>,
kernel list <linux-kernel@vger.kernel.org>,
torvalds@transmeta.com
Subject: swsusp: do not panic on bad signature with noresume
Date: Mon, 3 Feb 2003 18:31:53 +0100 [thread overview]
Message-ID: <20030203173153.GA339@elf.ucw.cz> (raw)
Hi!
This patch makes kernel ignore bad signature on suspend device when
"noresume" is given, and cleans things up a little bit. Please apply,
Pavel
--- clean/kernel/suspend.c 2003-01-17 23:12:24.000000000 +0100
+++ linux-swsusp/kernel/suspend.c 2003-02-03 17:51:25.000000000 +0100
@@ -1085,12 +1087,12 @@
else if (!memcmp("S2",cur->swh.magic.magic,2))
memcpy(cur->swh.magic.magic,"SWAPSPACE2",10);
else {
+ if (noresume)
+ return -EINVAL;
panic("%sUnable to find suspended-data signature (%.10s - misspelled?\n",
name_resume, cur->swh.magic.magic);
- /* We want to panic even with noresume -- we certainly don't want to add
- out signature into your ext2 filesystem ;-) */
}
- if(noresume) {
+ if (noresume) {
/* We don't do a sanity check here: we want to restore the swap
whatever version of kernel made the suspend image;
We need to write swap, but swap is *not* enabled so
@@ -1208,11 +1210,11 @@
/* We enable the possibility of machine suspend */
software_suspend_enabled = 1;
#endif
- if(!resume_status)
+ if (!resume_status)
return;
printk( "%s", name_resume );
- if(resume_status == NORESUME) {
+ if (resume_status == NORESUME) {
if(resume_file[0])
read_suspend_image(resume_file, 1);
printk( "disabled\n" );
@@ -1241,7 +1243,7 @@
static int __init resume_setup(char *str)
{
- if(resume_status)
+ if (resume_status == NORESUME)
return 1;
strncpy( resume_file, str, 255 );
@@ -1250,16 +1252,13 @@
return 1;
}
-static int __init software_noresume(char *str)
+static int __init noresume_setup(char *str)
{
- if(!resume_status)
- printk(KERN_WARNING "noresume option lacks a resume= option\n");
resume_status = NORESUME;
-
return 1;
}
-__setup("noresume", software_noresume);
+__setup("noresume", noresume_setup);
__setup("resume=", resume_setup);
EXPORT_SYMBOL(software_suspend);
--
Worst form of spam? Adding advertisment signatures ala sourceforge.net.
What goes next? Inserting advertisment *into* email?
reply other threads:[~2003-02-03 19:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030203173153.GA339@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
--cc=trivial@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.