kernel/kfifo.c: add handling of chained scatterlists
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: Stefani Seibold <stefani@seibold.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5af568cbd5
commit
d78a3eda69
|
@ -333,17 +333,16 @@ static int setup_sgl_buf(struct scatterlist *sgl, void *buf,
|
||||||
buf += PAGE_SIZE;
|
buf += PAGE_SIZE;
|
||||||
npage = virt_to_page(buf);
|
npage = virt_to_page(buf);
|
||||||
if (page_to_phys(page) != page_to_phys(npage) - l) {
|
if (page_to_phys(page) != page_to_phys(npage) - l) {
|
||||||
sgl->page_link = 0;
|
sg_set_page(sgl, page, l - off, off);
|
||||||
sg_set_page(sgl++, page, l - off, off);
|
sgl = sg_next(sgl);
|
||||||
if (++n == nents)
|
if (++n == nents || sgl == NULL)
|
||||||
return n;
|
return n;
|
||||||
page = npage;
|
page = npage;
|
||||||
len -= l - off;
|
len -= l - off;
|
||||||
l = off = 0;
|
l = off = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sgl->page_link = 0;
|
sg_set_page(sgl, page, len, off);
|
||||||
sg_set_page(sgl++, page, len, off);
|
|
||||||
return n + 1;
|
return n + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue