2004-09-16 23:57:42

by Nigel Cunningham

[permalink] [raw]
Subject: [PATCH] Suspend2 Merge: Supress various actions/errors while suspending [4/5]

Hi.

Patch 4: Disable pdflush while suspending.

Regards,

Nigel

diff -ruN linux-2.6.9-rc1/mm/page-writeback.c software-suspend-linux-2.6.9-rc1-rev3/mm/page-writeback.c
--- linux-2.6.9-rc1/mm/page-writeback.c 2004-09-07 21:59:01.000000000 +1000
+++ software-suspend-linux-2.6.9-rc1-rev3/mm/page-writeback.c 2004-09-09 19:36:24.000000000 +1000
@@ -29,6 +29,7 @@
#include <linux/sysctl.h>
#include <linux/cpu.h>
#include <linux/syscalls.h>
+#include <linux/suspend.h>

/*
* The maximum number of pages to writeout in a single bdflush/kupdate
@@ -369,6 +371,13 @@
.for_kupdate = 1,
};

+#ifdef CONFIG_SOFTWARE_SUSPEND2
+ if (software_suspend_state & SOFTWARE_SUSPEND_RUNNING) {
+ start_jif = jiffies;
+ next_jif = start_jif + (dirty_writeback_centisecs * HZ) / 100;
+ goto out;
+ }
+#endif
sync_supers();

get_writeback_state(&wbs);
@@ -389,6 +398,9 @@
}
nr_to_write -= MAX_WRITEBACK_PAGES - wbc.nr_to_write;
}
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+out:
+#endif
if (time_before(next_jif, jiffies + HZ))
next_jif = jiffies + HZ;
if (dirty_writeback_centisecs)

--
Nigel Cunningham
Pastoral Worker
Christian Reformed Church of Tuggeranong
PO Box 1004, Tuggeranong, ACT 2901

Many today claim to be tolerant. True tolerance, however, can cope with others
being intolerant.