Skip to content

Commit

Permalink
[PATCH] revert "swsusp: fix breakage with swap on lvm"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Mar 23, 2006
1 parent bdaff4a commit 2b322ce
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion kernel/power/swsusp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2b322ce

Please sign in to comment.