diff options
| author | Hannes Reinecke <hare@suse.de> | 2014-02-28 15:33:42 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-03-27 16:56:24 -0400 |
| commit | 17f4ff45b58742e2cb32fce6e406dbdb4b32a1e7 (patch) | |
| tree | ef392079dd18bd8dce3dae179786010fadfb0267 /drivers/md | |
| parent | 9cdb8520049629271ad411ac91ab1bea3e1cfa2b (diff) | |
| download | talos-obmc-linux-17f4ff45b58742e2cb32fce6e406dbdb4b32a1e7.tar.gz talos-obmc-linux-17f4ff45b58742e2cb32fce6e406dbdb4b32a1e7.zip | |
dm mpath: do not call pg_init when it is already running
This patch moves condition checks as a preparation of following
patches and has no effect on behaviour.
process_queued_ios() is the only caller of __pg_init_all_paths()
and 2 condition checks are moved from outside to inside without
side effects.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-mpath.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 422a9fdeb53e..c78e6a9e59ce 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -261,6 +261,9 @@ static void __pg_init_all_paths(struct multipath *m) struct pgpath *pgpath; unsigned long pg_init_delay = 0; + if (m->pg_init_in_progress || m->pg_init_disabled) + return; + m->pg_init_count++; m->pg_init_required = 0; if (m->pg_init_delay_retry) @@ -501,8 +504,7 @@ static void process_queued_ios(struct work_struct *work) (!pgpath && !m->queue_if_no_path)) must_queue = 0; - if (m->pg_init_required && !m->pg_init_in_progress && pgpath && - !m->pg_init_disabled) + if (pgpath && m->pg_init_required) __pg_init_all_paths(m); spin_unlock_irqrestore(&m->lock, flags); |
