From patchwork Fri Apr 28 13:06:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9704637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E5B8B60225 for ; Fri, 28 Apr 2017 13:07:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D790C28678 for ; Fri, 28 Apr 2017 13:07:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC9B828688; Fri, 28 Apr 2017 13:07:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A1DA28678 for ; Fri, 28 Apr 2017 13:07:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162243AbdD1NG7 (ORCPT ); Fri, 28 Apr 2017 09:06:59 -0400 Received: from mx2.suse.de ([195.135.220.15]:46138 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755456AbdD1NG5 (ORCPT ); Fri, 28 Apr 2017 09:06:57 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8565DAD18; Fri, 28 Apr 2017 13:06:56 +0000 (UTC) From: Martin Wilck To: "Martin K. Petersen" , Hannes Reinecke Cc: Bart Van Assche , Mauricio Faria de Oliveira , linux-scsi@vger.kernel.org Subject: [PATCH 1/3] scsi_dh_alua: Do not modify the interval value for retries Date: Fri, 28 Apr 2017 15:06:24 +0200 Message-Id: <20170428130626.32162-2-mwilck@suse.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170428130626.32162-1-mwilck@suse.com> References: <20170428130626.32162-1-mwilck@suse.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hannes Reinecke We shouldn't modify the interval value, as the struct is accessed from different devices and hence we might end up scheduling too early. Signed-off-by: Hannes Reinecke Reviewed-by: Martin Wilck --- drivers/scsi/device_handler/scsi_dh_alua.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index c01b47e5b55a..b90a5dec199f 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -681,7 +681,6 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) case SCSI_ACCESS_STATE_TRANSITIONING: if (time_before(jiffies, pg->expiry)) { /* State transition, retry */ - pg->interval = 2; err = SCSI_DH_RETRY; } else { struct alua_dh_data *h; @@ -836,11 +835,9 @@ static void alua_rtpg_work(struct work_struct *work) spin_lock_irqsave(&pg->lock, flags); if (err == SCSI_DH_RETRY || pg->flags & ALUA_PG_RUN_RTPG) { pg->flags |= ALUA_PG_RUN_RTPG; - pg->interval = 0; pg->flags &= ~ALUA_PG_RUNNING; spin_unlock_irqrestore(&pg->lock, flags); - queue_delayed_work(alua_wq, &pg->rtpg_work, - pg->interval * HZ); + queue_delayed_work(alua_wq, &pg->rtpg_work, 0); return; } } @@ -886,7 +883,7 @@ static bool alua_rtpg_queue(struct alua_port_group *pg, force = true; } if (pg->rtpg_sdev == NULL) { - pg->interval = 0; + pg->interval = 2; pg->flags |= ALUA_PG_RUN_RTPG; kref_get(&pg->kref); pg->rtpg_sdev = sdev;