[PATCH] revert "swsusp: fix breakage with swap on lvm"
Andrew Morton [Thu, 23 Mar 2006 10:59:58 +0000 (02:59 -0800)]
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>

kernel/power/swsusp.c

index 2d9d08f..4e90905 100644 (file)
@@ -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;