Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755417AbXJ0R4y (ORCPT ); Sat, 27 Oct 2007 13:56:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751255AbXJ0R4r (ORCPT ); Sat, 27 Oct 2007 13:56:47 -0400 Received: from Chamillionaire.breakpoint.cc ([85.10.199.196]:60350 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186AbXJ0R4q (ORCPT ); Sat, 27 Oct 2007 13:56:46 -0400 Date: Sat, 27 Oct 2007 19:56:41 +0200 From: Sebastian Siewior To: Jens Axboe Cc: linux-kernel@vger.kernel.org Subject: Re: [BUG] panic after umount (biscted) Message-ID: <20071027175641.GA19917@Chamillionaire.breakpoint.cc> References: <20071026070110.GA8927@Chamillionaire.breakpoint.cc> <20071026092724.GC5155@kernel.dk> <20071026093242.GD5155@kernel.dk> <20071026113524.GA10130@Chamillionaire.breakpoint.cc> <20071026114230.GG5155@kernel.dk> <20071027104436.GA19482@Chamillionaire.breakpoint.cc> <20071027113916.GH8875@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20071027113916.GH8875@kernel.dk> X-Key-Id: FE3F4706 X-Key-Fingerprint: FFDA BBBB 3563 1B27 75C9 925B 98D5 5C1C FE3F 4706 User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1691 Lines: 55 * Jens Axboe | 2007-10-27 13:39:16 [+0200]: >> [1] http://download.breakpoint.cc/bug/bug_patch2.jpeg 134 KiB > >OK, can you see what this produces? > >diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c >index 61fdaf0..4042269 100644 >--- a/drivers/scsi/scsi_lib.c >+++ b/drivers/scsi/scsi_lib.c >@@ -1115,6 +1115,8 @@ static int scsi_init_io(struct scsi_cmnd *cmd) > * kmapping pages) > */ > cmd->use_sg = req->nr_phys_segments; >+ if (!cmd->use_sg) >+ return 0; > > /* > * If sg table allocation fails, requeue request later. >@@ -1191,7 +1193,7 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req) > if (req->bio) { > int ret; > >- BUG_ON(!req->nr_phys_segments); >+ BUG_ON(!req->nr_phys_segments && req->bio->bi_size); > > ret = scsi_init_io(cmd); > if (unlikely(ret)) >@@ -1236,9 +1238,11 @@ int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req) > if (ret != BLKPREP_OK) > return ret; > /* >- * Filesystem requests must transfer data. >+ * Filesystem requests must transfer data, unless it's an empty >+ * barrier. > */ >- BUG_ON(!req->nr_phys_segments); >+ if (!req->nr_phys_segments && !bio_empty_barrier(req->bio)) >+ blk_dump_rq_flags(req, "scsi"); > > cmd = scsi_get_cmd_from_req(sdev, req); > if (unlikely(!cmd)) Good, [1] has the dmesg output after umount. [1] http://download.breakpoint.cc/bug/bug_patch3.jpeg 36 KiB >-- >Jens Axboe Sebastian - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/