From 78a42ce8fb2604c459e9ebb2a4f2d546b8250111 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Sun, 14 Dec 2008 00:55:17 +0900 Subject: [PATCH] [SCSI] osst: make all the buffer the same size This simiplifies the buffer management; all the buffers in osst_buffer become the same size. This is necessary to use the block layer API (sg driver was modified in the same way) since the block layer API takes the same size page frames instead of scatter gatter. Signed-off-by: FUJITA Tomonori Cc: Willem Riede Signed-off-by: James Bottomley --- drivers/scsi/osst.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 8f21cbbd7aaf..13f908cb0674 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c @@ -5286,11 +5286,6 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma) struct page *page = alloc_pages(priority, (OS_FRAME_SIZE - got <= PAGE_SIZE) ? 0 : order); STbuffer->sg[segs].offset = 0; if (page == NULL) { - if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size / 2 && order) { - b_size /= 2; /* Large enough for the rest of the buffers */ - order--; - continue; - } printk(KERN_WARNING "osst :W: Failed to enlarge buffer to %d bytes.\n", OS_FRAME_SIZE); #if DEBUG