Pārlūkot izejas kodu

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

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>
Andrew Morton 19 gadi atpakaļ
vecāks
revīzija
2b322ce210
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 3 1
      kernel/power/swsusp.c

+ 3 - 1
kernel/power/swsusp.c

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