From patchwork Sun Jan 6 05:14:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y b X-Patchwork-Id: 209726 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB04A2C0087 for ; Sun, 6 Jan 2013 16:14:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750762Ab3AFFOZ (ORCPT ); Sun, 6 Jan 2013 00:14:25 -0500 Received: from mail-da0-f52.google.com ([209.85.210.52]:59457 "EHLO mail-da0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750717Ab3AFFOZ (ORCPT ); Sun, 6 Jan 2013 00:14:25 -0500 Received: by mail-da0-f52.google.com with SMTP id f10so8088799dak.11 for ; Sat, 05 Jan 2013 21:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=P8iPCDGREhCOS1BisaXFhPWYSEoxd9MI9DY16ASE/yI=; b=jy0h7ROQDgdScB8vtIdMUuWESTCqgU78iaaSTMNVs2fQjpucyUUlNObcfnyxe711/P l+x/PmdwolddVvvD2VYylLrN98yIKK4JVtsCfWWdHBHVclOsiYUGgObnzJXvnkHmPtmC iYEBsMKsiP9WDTYEKkhjss86Whqk7ubiOiN0J9d0NL3QCql6fdmCaC+OkZMwh5Jh1RNg 8CIrF9OqWBvQD7isKeCWCLpvrGkj5SN17fcHn25zT/j70bmWhSozePKm7/csEkQ7QzBI 7XDL22ymnEj0PZtySjSofulnYwQ3BYtmuixfs3ST6W2fH25c9gkelTgDTHEc43cXgH0s 2KYw== MIME-Version: 1.0 Received: by 10.68.238.106 with SMTP id vj10mr178936146pbc.40.1357449264948; Sat, 05 Jan 2013 21:14:24 -0800 (PST) Received: by 10.66.102.39 with HTTP; Sat, 5 Jan 2013 21:14:24 -0800 (PST) Date: Sun, 6 Jan 2013 13:14:24 +0800 Message-ID: Subject: Fix ahci don't retry commands after a success error handler. From: y b To: jgarzik@pobox.com, kernel@teksavvy.com Cc: linux-ide@vger.kernel.org Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From 78c0fb104c9957db682518b97ce6a01ce1bc07b6 Mon Sep 17 00:00:00 2001 From: Bian Yu Date: Wed, 12 Dec 2012 22:26:58 -0500 Subject: [PATCH] It should be a mistake introduced by commit 8d899e70c1b3afff. because only qc->flags can't be set AC_ERR_* Signed-off-by: Bian Yu --- drivers/ata/libata-eh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) return 1; /* otherwise retry anything from fs stack */ diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index bf039b0..bcf4437 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2094,7 +2094,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, */ static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc) { - if (qc->flags & AC_ERR_MEDIA) + if (qc->err_mask & AC_ERR_MEDIA) return 0; /* don't retry media errors */ if (qc->flags & ATA_QCFLAG_IO)