Skip to contentSkip to conversation

revert "swsusp: fix breakage with swap on lvm"

PATCH Dave Jones 2 participants 4 messages Jun 12, 2006 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dave Jones

author
#1 lore raw
Quoted 27 lines · Linux Kernel

commit 2b322ce210aec74ae0d02938d3a01e29fe079469
tree a9cb9aa9530cadacae62caf009db506db16eb3c1
parent bdaff4a331db46f3bd953f413316c4603c4004b4
author Andrew Morton <[email protected]> Thu, 23 Mar 2006 18:59:58 -0800 committer Linus Torvalds <[email protected]> Thu, 23 Mar 2006 23:38:07 -0800

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

This was a temporary thing for 2.6.16.

Cc "Rafael J. Wysocki" <[email protected]>
Cc Pavel Machek <[email protected]>
 kernel/power/swsusp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)
kernel/power/swsusp.c +1 -0
index 2d9d08f..4e90905 100644
@@ -153,11 +153,13 @@ static int swsusp_swap_check(void) /* Th
 {
 	int i;
 
+	if (!swsusp_resume_device)

kernel/power/swsusp.c static int swsusp_swap_check(void) /* Th · line 165

Quoted 10 lines
kernel/power/swsusp.c +2 -1
+		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;

So, now I'm getting bug reports from users about .17rc breaking their resume again. (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=194784)

If this was a temporary thing, what should we be doing to keep old installations working ?

Dave

Signature · 1 line
http://www.codemonkey.org.uk
#2 lore raw
Quoted 42 lines · Dave Jones
Quoted 27 lines · Linux Kernel

commit 2b322ce210aec74ae0d02938d3a01e29fe079469
tree a9cb9aa9530cadacae62caf009db506db16eb3c1
parent bdaff4a331db46f3bd953f413316c4603c4004b4
author Andrew Morton <[email protected]> Thu, 23 Mar 2006 18:59:58 -0800 committer Linus Torvalds <[email protected]> Thu, 23 Mar 2006 23:38:07 -0800

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

This was a temporary thing for 2.6.16.

Cc "Rafael J. Wysocki" <[email protected]>
Cc Pavel Machek <[email protected]>
 kernel/power/swsusp.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)
kernel/power/swsusp.c +1 -0
index 2d9d08f..4e90905 100644
@@ -153,11 +153,13 @@ static int swsusp_swap_check(void) /* Th
 {
 	int i;
 
+	if (!swsusp_resume_device)

kernel/power/swsusp.c static int swsusp_swap_check(void) /* Th · line 165

Quoted 10 lines
kernel/power/swsusp.c +2 -1
+		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;

So, now I'm getting bug reports from users about .17rc breaking their resume again. (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=194784)

Quoted 2 lines

If this was a temporary thing, what should we be doing to keep old installations working ?

This was temporary, because the handling of it has been moved to kernel/power/swap.c and mm/swapfile.c now, but the code has not changed much (surely it doesn't return -ENODEV if swsusp_resume_device is not set). Moreover, the new code has been in -rc since 2.6.17-rc1.

The report you are referring to is for the kernel called 2.6.16-1.2255_FC6. Is this just 2.6.17-rc* renamed or is it related to -rc in another way?

Greetings,
Rafael

author
#3 lore raw
Quoted 6 lines · Rafael J. Wysocki
Quoted 5 lines

So, now I'm getting bug reports from users about .17rc breaking their resume again. (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=194784)

If this was a temporary thing, what should we be doing to keep old installations working ?

Quoted 7 lines

This was temporary, because the handling of it has been moved to kernel/power/swap.c and mm/swapfile.c now, but the code has not changed much (surely it doesn't return -ENODEV if swsusp_resume_device is not set). Moreover, the new code has been in -rc since 2.6.17-rc1.

The report you are referring to is for the kernel called 2.6.16-1.2255_FC6. Is this just 2.6.17-rc* renamed or is it related to -rc in another way?

Yes, it's .17rc6.
(They only become a 2.6.17-x after .17 is final)

Dave

Signature · 1 line
http://www.codemonkey.org.uk
#4 lore raw
Quoted 13 lines · Dave Jones
Quoted 11 lines · Rafael J. Wysocki
Quoted 5 lines

So, now I'm getting bug reports from users about .17rc breaking their resume again. (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=194784)

If this was a temporary thing, what should we be doing to keep old installations working ?

This was temporary, because the handling of it has been moved to kernel/power/swap.c and mm/swapfile.c now, but the code has not changed much (surely it doesn't return -ENODEV if swsusp_resume_device is not set). Moreover, the new code has been in -rc since 2.6.17-rc1.

Quoted 5 lines
Quoted 2 lines

The report you are referring to is for the kernel called 2.6.16-1.2255_FC6. Is this just 2.6.17-rc* renamed or is it related to -rc in another way?

Yes, it's .17rc6.
(They only become a 2.6.17-x after .17 is final)

Clear.

Well, I need some more information.

I don't think the breakage has been caused by any of my patches this time, so I'll have to figure out what else might have caused it. [The problem is last significant changes in swsusp that might be related to this were commited a couple of months ago. ;-) ]

Greetings,
Rafael