From patchwork Thu Oct 1 18:53:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 34764 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 01534B7BB2 for ; Fri, 2 Oct 2009 04:52:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752952AbZJASwv (ORCPT ); Thu, 1 Oct 2009 14:52:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755694AbZJASwv (ORCPT ); Thu, 1 Oct 2009 14:52:51 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:60828 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952AbZJASwv (ORCPT ); Thu, 1 Oct 2009 14:52:51 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id A3DA7C8C1EC; Thu, 1 Oct 2009 11:53:10 -0700 (PDT) Date: Thu, 01 Oct 2009 11:53:10 -0700 (PDT) Message-Id: <20091001.115310.100974682.davem@davemloft.net> To: manty@manty.net Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Subject: Re: kernel BUG at drivers/ide/ide-disk.c:187 (2.6.31) From: David Miller In-Reply-To: <20091001.114755.132624639.davem@davemloft.net> References: <20090930110529.GA3676@dis.manty.net> <20091001.114755.132624639.davem@davemloft.net> X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: David Miller Date: Thu, 01 Oct 2009 11:47:55 -0700 (PDT) > Please add this test patch and let us know what messages > you end up with in the logs. It won't BUG() any more, > so you have to watch for the messages. Sorry, there's a small bug in the test patch, please use this one instead. --- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 7f87801..6e0dfa9 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -184,7 +184,12 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq, ide_hwif_t *hwif = drive->hwif; BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED); - BUG_ON(!blk_fs_request(rq)); + if (!blk_fs_request(rq)) { + pr_alert("IDE: Non-FS req in ide_do_rw_disk(), cmd_type %d\n", + rq->cmd_type); + ide_kill_rq(drive, rq); + return ide_stopped; + } ledtrig_ide_activity();