aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorKiyoshi Ueda <k-ueda@ct.jp.nec.com>2010-03-05 21:29:59 -0500
committerAlasdair G Kergon <agk@redhat.com>2010-03-05 21:29:59 -0500
commitfce323dd68e13354071538c765b062859e6f8286 (patch)
treea6850c35a5d4954a81ef922eeaed2ee4d69e4b89 /drivers/md
parentc53a381efbe3d0e0629121b3f0d2b62a0e167791 (diff)
dm mpath: avoid storing private suspended state
'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 related code. Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Cc: Mike Anderson <andmike@linux.vnet.ibm.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-mpath.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index ecada419809c..8fa0c955eeb5 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -95,8 +95,6 @@ struct multipath {
95 mempool_t *mpio_pool; 95 mempool_t *mpio_pool;
96 96
97 struct mutex work_mutex; 97 struct mutex work_mutex;
98
99 unsigned suspended; /* Don't create new I/O internally when set. */
100}; 98};
101 99
102/* 100/*
@@ -1278,7 +1276,6 @@ static void multipath_postsuspend(struct dm_target *ti)
1278 struct multipath *m = ti->private; 1276 struct multipath *m = ti->private;
1279 1277
1280 mutex_lock(&m->work_mutex); 1278 mutex_lock(&m->work_mutex);
1281 m->suspended = 1;
1282 flush_multipath_work(); 1279 flush_multipath_work();
1283 mutex_unlock(&m->work_mutex); 1280 mutex_unlock(&m->work_mutex);
1284} 1281}
@@ -1291,10 +1288,6 @@ static void multipath_resume(struct dm_target *ti)
1291 struct multipath *m = (struct multipath *) ti->private; 1288 struct multipath *m = (struct multipath *) ti->private;
1292 unsigned long flags; 1289 unsigned long flags;
1293 1290
1294 mutex_lock(&m->work_mutex);
1295 m->suspended = 0;
1296 mutex_unlock(&m->work_mutex);
1297
1298 spin_lock_irqsave(&m->lock, flags); 1291 spin_lock_irqsave(&m->lock, flags);
1299 m->queue_if_no_path = m->saved_queue_if_no_path; 1292 m->queue_if_no_path = m->saved_queue_if_no_path;
1300 spin_unlock_irqrestore(&m->lock, flags); 1293 spin_unlock_irqrestore(&m->lock, flags);
@@ -1430,11 +1423,6 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)
1430 1423
1431 mutex_lock(&m->work_mutex); 1424 mutex_lock(&m->work_mutex);
1432 1425
1433 if (m->suspended) {
1434 r = -EBUSY;
1435 goto out;
1436 }
1437
1438 if (dm_suspended(ti)) { 1426 if (dm_suspended(ti)) {
1439 r = -EBUSY; 1427 r = -EBUSY;
1440 goto out; 1428 goto out;