aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-12-13 10:55:17 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-03-12 13:58:10 -0400
commit78a42ce8fb2604c459e9ebb2a4f2d546b8250111 (patch)
tree45140532e04725fe45bb83b10088a0a42ba7858f
parent68274794c69991121eaf0a4a35b78aa7f088ec2c (diff)
[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 <fujita.tomonori@lab.ntt.co.jp> Cc: Willem Riede <osst@riede.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/osst.c5
1 files changed, 0 insertions, 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)
5286 struct page *page = alloc_pages(priority, (OS_FRAME_SIZE - got <= PAGE_SIZE) ? 0 : order); 5286 struct page *page = alloc_pages(priority, (OS_FRAME_SIZE - got <= PAGE_SIZE) ? 0 : order);
5287 STbuffer->sg[segs].offset = 0; 5287 STbuffer->sg[segs].offset = 0;
5288 if (page == NULL) { 5288 if (page == NULL) {
5289 if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size / 2 && order) {
5290 b_size /= 2; /* Large enough for the rest of the buffers */
5291 order--;
5292 continue;
5293 }
5294 printk(KERN_WARNING "osst :W: Failed to enlarge buffer to %d bytes.\n", 5289 printk(KERN_WARNING "osst :W: Failed to enlarge buffer to %d bytes.\n",
5295 OS_FRAME_SIZE); 5290 OS_FRAME_SIZE);
5296#if DEBUG 5291#if DEBUG