Messages in this thread Patch in this message | | | Date | Wed, 12 Dec 2001 10:02:53 +0100 | From | Jens Axboe <> | Subject | Re: Scsi problems in 2.5.1-pre9 |
| |
On Tue, Dec 11 2001, David S. Miller wrote: > From: Anton Blanchard <anton@samba.org> > Date: Wed, 12 Dec 2001 09:17:47 +1100 > > > In that case you perhaps should be defining DMA_CHUNK_SIZE in > > asm/dma.h :-) > > Hmm I have it defined, just not in dma.h :) I'll fix it now and retest. > > Oh nevermind then, the location really is almost arbitrary. > As long as scsi_merge.c sees it. > > Note this is one area Jens hasn't been able to test and I've been > trying first to solidify my sparc64 setup without DMA_CHUNK_SIZE > defined.
Dave nailed this bug, Anton you'll want to apply it before testing :-) It fixes a case of too much copy'n paste with back merges + DMA_CHUNK_SIZE enabled.
-- Jens Axboe
--- /opt/kernel/linux-2.5.1-pre10/drivers/scsi/scsi_merge.c Tue Dec 11 13:30:36 2001 +++ drivers/scsi/scsi_merge.c Wed Dec 12 03:59:58 2001 @@ -307,7 +307,7 @@ } #ifdef DMA_CHUNK_SIZE - if (MERGEABLE_BUFFERS(bio, req->bio)) + if (MERGEABLE_BUFFERS(req->biotail, bio)) return scsi_new_mergeable(q, req, bio); #endif | |