From patchwork Fri May 11 18:51:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 912121 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="RWjkAe3g"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40jK1x1nm8z9s16 for ; Sat, 12 May 2018 04:51:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751449AbeEKSvc (ORCPT ); Fri, 11 May 2018 14:51:32 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:41347 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbeEKSvc (ORCPT ); Fri, 11 May 2018 14:51:32 -0400 Received: by mail-io0-f195.google.com with SMTP id e12-v6so8118142iob.8 for ; Fri, 11 May 2018 11:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WsFPu4hWhJlrDtXMRXWXaoFI/59CklU0u94nasL3X34=; b=RWjkAe3gN1GnQZctdjd5aI6au0Z6tcOwfi5Uj4JMzajG1Vw7iV52pHlvzPNysvpab2 ErKy7Jhr1iH9JtUaQ+QqRXAJ1FD8woyf4lF1kmPWHi3uyw/ydjdRzfbTXdHbENLiAi0H JH0RyXLKE2MjGrPvi+OP3yMfqyTnQotvdZsUmebcdNB8DwY7mm+3/VARFk4YdlKjKX/B f8n04dLn7SYPaB++i2mCZNsRuv1vUecWJvndov8MFb75nXzzO2c70+U0FcGT1PRZP69R 9zWsN3fhG6P9bmWSZ++GoWS/ov5sVRAUQoK2E/lXiL/BiY91WCOx7QlXOzkhb8+W8mv7 1hHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WsFPu4hWhJlrDtXMRXWXaoFI/59CklU0u94nasL3X34=; b=DRV2zr84ZMT2Ob2oz+NzSMqwWtSyW5KPqZZfjPr1Z/plRlECXxxTgfUHaxLqy6Rcl7 IDMww4O7rtx1o4o5jcvkFccw1ELw+2z+Ikg9gx+Ok4m4s5HZh2v6oSWLpBfiqQSJkjVS wzsoTTPDCTW8oipHNbKpRSEu5a/wnJuYHElMMspqIWdYXVHb47+DkXjQzpBb++fKU2AI jY6D4BQ+DCW9U70ukh8xo6+/PMVKbs1jCwxk9YOETNGEr0JMDaUAqj45m9a/CxY6Fuok N8GrZ2E5LN+pNdo0DBOatiNqOelkOLSB/WCc+xzf/xpxnClw56rLGNMJ+N5B+fyIGQ6u vbgw== X-Gm-Message-State: ALKqPwfgjPUB07NveTCTbJs6AI3DixxQVcA6JbGZDUM1sznVoTrzAfzW Am3pc4nNed6irLpXqe/Tu39SL/Yx8Jg= X-Google-Smtp-Source: AB8JxZokXi0oOLahDWEg5OkrYVNR730PaF5UBmAqjfLIiCJYDsOzJvXgCw9M6y+Gj49Fz4pfSW3Uig== X-Received: by 2002:a6b:5301:: with SMTP id h1-v6mr7460786iob.73.1526064691087; Fri, 11 May 2018 11:51:31 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id q6-v6sm966610itb.38.2018.05.11.11.51.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 May 2018 11:51:29 -0700 (PDT) From: Jens Axboe To: linux-ide@vger.kernel.org Cc: tj@kernel.org, Jens Axboe Subject: [PATCH 5/9] libata: remove assumption that ATA_MAX_QUEUE - 1 is the max Date: Fri, 11 May 2018 12:51:07 -0600 Message-Id: <1526064671-7528-6-git-send-email-axboe@kernel.dk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526064671-7528-1-git-send-email-axboe@kernel.dk> References: <1526064671-7528-1-git-send-email-axboe@kernel.dk> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org In a few spots we iterate to ATA_MAX_QUEUE -1, including internal knowledge that the last tag is the internal tag. Remove this assumption. Signed-off-by: Jens Axboe --- drivers/ata/libata-eh.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 513b260bcff1..cbf7c9501e47 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -873,9 +873,12 @@ static int ata_eh_nr_in_flight(struct ata_port *ap) int nr = 0; /* count only non-internal commands */ - for (tag = 0; tag < ATA_MAX_QUEUE - 1; tag++) + for (tag = 0; tag < ATA_MAX_QUEUE; tag++) { + if (ata_tag_internal(tag)) + continue; if (ata_qc_from_tag(ap, tag)) nr++; + } return nr; } @@ -900,7 +903,7 @@ void ata_eh_fastdrain_timerfn(struct timer_list *t) /* No progress during the last interval, tag all * in-flight qcs as timed out and freeze the port. */ - for (tag = 0; tag < ATA_MAX_QUEUE - 1; tag++) { + for (tag = 0; tag < ATA_MAX_QUEUE; tag++) { struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag); if (qc) qc->err_mask |= AC_ERR_TIMEOUT;