Re: [PATCH 2/4] add the new generic kfifo API

["Ira W. Snyder" <iws@ovro.caltech.edu>]

On Sat, May 29, 2010 at 08:48:14PM +0200, Stefani Seibold wrote:
> Hi Ira,
> 
> please don't send me back the hole patch. If you want enhance something,
> please write a clean patch which can i apply against the generic API
> patch.
> 

If you looked down far enough, I put my comments inline. I should have
snipped out the extra noise, sorry.

Here is a completely untested patch that should fix kfifo when used with
chained scatterlists (AKA struct sg_table). Feel free to roll it into
the main patch.

Ira

>From 01d90fc6fb35e16b034f0893cd717af51c690cc7 Mon Sep 17 00:00:00 2001
From: Ira W. Snyder <kernel@irasnyder.com>
Date: Sat, 29 May 2010 12:02:47 -0700
Subject: [PATCH] kfifo: fix scatterlist usage

The current kfifo scatterlist implementation will not work with chained
scatterlists. It assumes that struct scatterlist arrays are allocated
contiguously, which is not the case when chained scatterlists (struct
sg_table) are in use.

Signed-off-by: Ira W. Snyder <kernel@irasnyder.com>
---
 kernel/kfifo.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/kfifo.c b/kernel/kfifo.c
index 02192dd..bd4e083 100644
--- a/kernel/kfifo.c
+++ b/kernel/kfifo.c
@@ -333,17 +333,16 @@ static int setup_sgl_buf(struct scatterlist *sgl, void *buf,
 		buf += PAGE_SIZE;
 		npage = virt_to_page(buf);
 		if (page_to_phys(page) != page_to_phys(npage) - l) {
-			sgl->page_link = 0;
-			sg_set_page(sgl++, page, l - off, off);
-			if (++n == nents)
+			sg_set_page(sgl, page, l - off, off);
+			sgl = sg_next(sgl);
+			if (++n == nents || sgl == NULL)
 				return n;
 			page = npage;
 			len -= l - off;
 			l = off = 0;
 		}
 	}
-	sgl->page_link = 0;
-	sg_set_page(sgl++, page, len, off);
+	sg_set_page(sgl, page, len, off);
 	return n + 1;
 }
 
-- 
1.7.1