Skip to contentSkip to conversation

dm-mpath: Remove 'suspended' flag from struct multipath

PATCH New Kiyoshi Ueda 1 participant 1 message Dec 21, 2009 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm-mpath: Remove 'suspended' flag from struct multipath

Hi Alasdair,

'suspended' flag in struct multipath was introduced to check whether the multipath target is in suspended state, but the same check is done through dm_suspended() now.
So remove the flag and the related codes.

This patch is for 2.6.33-rc1.
Please apply.

Cc Alasdair G Kergon <[email protected]>
Cc Mike Anderson <[email protected]>
---
 drivers/md/dm-mpath.c |   12 ------------
 1 file changed, 12 deletions(-)
drivers/md/dm-mpath.c +0 -12
Index: 2.6.33-rc1/drivers/md/dm-mpath.c
===================================================================
@@ -95,8 +95,6 @@ struct multipath {
 	mempool_t *mpio_pool;
 
 	struct mutex work_mutex;
-
-	unsigned suspended;	/* Don't create new I/O internally when set. */
 };
 
 /*
@@ -1276,7 +1274,6 @@ static void multipath_postsuspend(struct
 	struct multipath *m = ti->private;
 
 	mutex_lock(&m->work_mutex);
-	m->suspended = 1;
 	flush_multipath_work();
 	mutex_unlock(&m->work_mutex);
 }
@@ -1289,10 +1286,6 @@ static void multipath_resume(struct dm_t
 	struct multipath *m = (struct multipath *) ti->private;
 	unsigned long flags;
 
-	mutex_lock(&m->work_mutex);
-	m->suspended = 0;
-	mutex_unlock(&m->work_mutex);
-
 	spin_lock_irqsave(&m->lock, flags);
 	m->queue_if_no_path = m->saved_queue_if_no_path;
 	spin_unlock_irqrestore(&m->lock, flags);
@@ -1428,11 +1421,6 @@ static int multipath_message(struct dm_t
 
 	mutex_lock(&m->work_mutex);
 
-	if (m->suspended) {
-		r = -EBUSY;
-		goto out;
-	}
-
 	if (dm_suspended(ti)) {
 		r = -EBUSY;
 		goto out;