[RFC,2/4] dm-log: update resume method for interruption of presuspend

Commit Message

Takahiro Yasui Feb. 23, 2010, 6:45 p.m. UTC

None

Patch

Index: linux-2.6.33-rc1-dm/drivers/md/dm-log.c
===================================================================
--- linux-2.6.33-rc1-dm.orig/drivers/md/dm-log.c
+++ linux-2.6.33-rc1-dm/drivers/md/dm-log.c
@@ -593,6 +593,10 @@  static int disk_resume(struct dm_dirty_l
 	struct log_c *lc = (struct log_c *) log->context;
 	size_t size = lc->bitset_uint32_count * sizeof(uint32_t);
 
+	/* Just returns if the state is not "suspended." */
+	if (!dm_suspended(lc->ti))
+		return 0;
+
 	/* read the disk header */
 	r = read_header(lc);
 	if (r) {
@@ -658,6 +662,11 @@  static uint32_t core_get_region_size(str
 static int core_resume(struct dm_dirty_log *log)
 {
 	struct log_c *lc = (struct log_c *) log->context;
+
+	/* Just returns if the state is not "suspended." */
+	if (!dm_suspended(lc->ti))
+		return 0;
+
 	lc->sync_search = 0;
 	return 0;
 }