All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <201109250056.12545.rjw@sisk.pl>

diff --git a/a/1.txt b/N1/1.txt
index eed8bc5..8eb6302 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -161,3 +161,23 @@ Index: linux/kernel/power/hibernate.c
 -	error = dpm_prepare(PMSG_FREEZE);
 -	if (error)
 -		goto Complete_devices;
+-
+ 	/* Preallocate image memory before shutting down devices. */
+ 	error = hibernate_preallocate_memory();
+ 	if (error)
++		goto Close;
++
++	error = freeze_kernel_threads();
++	if (error)
++		goto Close;
++
++	error = dpm_prepare(PMSG_FREEZE);
++	if (error)
+ 		goto Complete_devices;
+ 
+ 	suspend_console();
+
+_______________________________________________
+xfs mailing list
+xfs@oss.sgi.com
+http://oss.sgi.com/mailman/listinfo/xfs
diff --git a/a/content_digest b/N1/content_digest
index f436498..cb71813 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,16 +5,16 @@
  "Subject\0Re: [PATCH] PM / Freezer: Freeze filesystems while freezing processes (v2)\0"
  "Date\0Sun, 25 Sep 2011 00:56:12 +0200\0"
  "To\0Dave Chinner <david@fromorbit.com>\0"
- "Cc\0Linux PM mailing list <linux-pm@lists.linux-foundation.org>"
-  Pavel Machek <pavel@ucw.cz>
-  Nigel Cunningham <nigel@tuxonice.net>
-  Christoph Hellwig <hch@infradead.org>
-  Christoph <cr2005@u-club.de>
-  xfs@oss.sgi.com
-  LKML <linux-kernel@vger.kernel.org>
-  linux-ext4@vger.kernel.org
+ "Cc\0Christoph <cr2005@u-club.de>"
   Theodore Ts'o <tytso@mit.edu>
- " linux-fsdevel@vger.kernel.org\0"
+  LKML <linux-kernel@vger.kernel.org>
+  xfs@oss.sgi.com
+  Christoph Hellwig <hch@infradead.org>
+  Nigel Cunningham <nigel@tuxonice.net>
+  Pavel Machek <pavel@ucw.cz>
+  linux-fsdevel@vger.kernel.org
+  Linux PM mailing list <linux-pm@lists.linux-foundation.org>
+ " linux-ext4@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Sunday, August 07, 2011, Dave Chinner wrote:\n"
@@ -179,6 +179,26 @@
  " \n"
  "-\terror = dpm_prepare(PMSG_FREEZE);\n"
  "-\tif (error)\n"
- "-\t\tgoto Complete_devices;"
+ "-\t\tgoto Complete_devices;\n"
+ "-\n"
+ " \t/* Preallocate image memory before shutting down devices. */\n"
+ " \terror = hibernate_preallocate_memory();\n"
+ " \tif (error)\n"
+ "+\t\tgoto Close;\n"
+ "+\n"
+ "+\terror = freeze_kernel_threads();\n"
+ "+\tif (error)\n"
+ "+\t\tgoto Close;\n"
+ "+\n"
+ "+\terror = dpm_prepare(PMSG_FREEZE);\n"
+ "+\tif (error)\n"
+ " \t\tgoto Complete_devices;\n"
+ " \n"
+ " \tsuspend_console();\n"
+ "\n"
+ "_______________________________________________\n"
+ "xfs mailing list\n"
+ "xfs@oss.sgi.com\n"
+ http://oss.sgi.com/mailman/listinfo/xfs
 
-01834339892c041f06eced7154e77fdb5826714b66e52c17a5779aeecfd5a109
+98b80968fd6f39c8b539cab645eee187dcb64dce9a5236724a3f42d9cb2708e5

diff --git a/a/1.txt b/N2/1.txt
index eed8bc5..2cdc91c 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -161,3 +161,18 @@ Index: linux/kernel/power/hibernate.c
 -	error = dpm_prepare(PMSG_FREEZE);
 -	if (error)
 -		goto Complete_devices;
+-
+ 	/* Preallocate image memory before shutting down devices. */
+ 	error = hibernate_preallocate_memory();
+ 	if (error)
++		goto Close;
++
++	error = freeze_kernel_threads();
++	if (error)
++		goto Close;
++
++	error = dpm_prepare(PMSG_FREEZE);
++	if (error)
+ 		goto Complete_devices;
+ 
+ 	suspend_console();
diff --git a/a/content_digest b/N2/content_digest
index f436498..04cfbc5 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -179,6 +179,21 @@
  " \n"
  "-\terror = dpm_prepare(PMSG_FREEZE);\n"
  "-\tif (error)\n"
- "-\t\tgoto Complete_devices;"
+ "-\t\tgoto Complete_devices;\n"
+ "-\n"
+ " \t/* Preallocate image memory before shutting down devices. */\n"
+ " \terror = hibernate_preallocate_memory();\n"
+ " \tif (error)\n"
+ "+\t\tgoto Close;\n"
+ "+\n"
+ "+\terror = freeze_kernel_threads();\n"
+ "+\tif (error)\n"
+ "+\t\tgoto Close;\n"
+ "+\n"
+ "+\terror = dpm_prepare(PMSG_FREEZE);\n"
+ "+\tif (error)\n"
+ " \t\tgoto Complete_devices;\n"
+ " \n"
+ " \tsuspend_console();"
 
-01834339892c041f06eced7154e77fdb5826714b66e52c17a5779aeecfd5a109
+44c7af93025eec68505e1d023045354457271c613fdc2893d287aea753dc76b4

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.