From: Hannes Reinecke Date: Fri, 28 Feb 2014 14:33:42 +0000 (+0100) Subject: dm mpath: do not call pg_init when it is already running X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=17f4ff45b58742e2cb32fce6e406dbdb4b32a1e7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Mike Snitzer Reviewed-by: Jun'ichi Nomura --- 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);