lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] revert "swsusp: fix breakage with swap on lvm"

Browse Source 
This was a temporary thing for 2.6.16.

Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-03-23 02:59:58 -08:00
committed by Linus Torvalds
parent bdaff4a331
commit 2b322ce210
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/power/swsusp.c
View File

@@ -153,11 +153,13 @@ static int swsusp_swap_check(void) /* This is called before saving image */
{ {
int i; int i;
if (!swsusp_resume_device)
return -ENODEV;
spin_lock(&swap_lock); spin_lock(&swap_lock);
for (i = 0; i < MAX_SWAPFILES; i++) { for (i = 0; i < MAX_SWAPFILES; i++) {
if (!(swap_info[i].flags & SWP_WRITEOK)) if (!(swap_info[i].flags & SWP_WRITEOK))
continue; continue;
if (!swsusp_resume_device || is_resume_device(swap_info + i)) { if (is_resume_device(swap_info + i)) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
root_swap = i; root_swap = i;
return 0; return 0;