[PATCH] Make pmdisk suspend more reliable

[PATCH] Make pmdisk suspend more reliable

[Tony Lindgren]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Hi Patrick & all,

Here's a little patch to make pmdisk suspend to disk work on my old
laptop. Basically at least the PMDISK_SIG never got to the disk, and
finding the suspend image would fail without this patch. The patch is
against linux-2.6.0-test7.

Pls cc me on any replies, I'm not on the list right now.

Regards,

Tony



[-- Attachment #2: pmdisk-bdflush.patch --]
[-- Type: text/plain, Size: 560 bytes --]

--- linux-2.6.0-test7/kernel/power/pmdisk.c-orig	2003-10-12 18:35:58.000000000 +0300
+++ linux-2.6.0-test7/kernel/power/pmdisk.c	2003-10-12 19:00:32.000000000 +0300
@@ -35,6 +35,7 @@
 
 
 extern int pmdisk_arch_suspend(int resume);
+extern int wakeup_bdflush(long nr_pages);
 
 #define __ADDRESS(x)  ((unsigned long) phys_to_virt(x))
 #define ADDRESS(x) __ADDRESS((x) << PAGE_SHIFT)
@@ -372,6 +373,9 @@
 		goto FreePagedir;
 
 	error = mark_swapfiles(prev);
+
+	/* Make sure the data gets to disk */
+	wakeup_bdflush(0);
  Done:
 	return error;
  FreePagedir:

Re: [PATCH] Make pmdisk suspend more reliable

[Sam Ravnborg]

On Sun, Oct 12, 2003 at 09:18:28AM -0700, Tony Lindgren wrote:

> --- linux-2.6.0-test7/kernel/power/pmdisk.c-orig	2003-10-12 18:35:58.000000000 +0300
> +++ linux-2.6.0-test7/kernel/power/pmdisk.c	2003-10-12 19:00:32.000000000 +0300
> @@ -35,6 +35,7 @@
>  
>  
>  extern int pmdisk_arch_suspend(int resume);
> +extern int wakeup_bdflush(long nr_pages);

Prototypes in .c files is never a good idea.
wakeup_bdflush is prototyped in include/linux/writeback.h

pmdisk_arch_suspend is expected to be implemented in assembler, which
explain why it is prototypes locally.

	Sam

Re: [PATCH] Make pmdisk suspend more reliable

[Tony Lindgren]

Hi,

* Sam Ravnborg <sam@ravnborg.org> [031012 11:07]:
> On Sun, Oct 12, 2003 at 09:18:28AM -0700, Tony Lindgren wrote:
> 
> >  extern int pmdisk_arch_suspend(int resume);
> > +extern int wakeup_bdflush(long nr_pages);
> 
> Prototypes in .c files is never a good idea.
> wakeup_bdflush is prototyped in include/linux/writeback.h

I guess you mean to #include <linux/writeback.h> instead of extern, or
did I misunderstand what you meant?

There may be more to the suspend image not getting to the disk besides
flushing, I'm now wondering if it works with IDE DMA enabled, but not
without DMA. I'll try to investigate it a bit further.

Tony