diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
| commit | c4fc108a8275f5eb77c9859725643a6870d20ef6 (patch) | |
| tree | de7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/scsi/st.c | |
| parent | 741854e4f9a23421e194df8d846899172ff393d6 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
| download | linux-c4fc108a8275f5eb77c9859725643a6870d20ef6.tar.gz linux-c4fc108a8275f5eb77c9859725643a6870d20ef6.tar.xz | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 770c4324f3d5..7ac6ea141fff 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -4509,6 +4509,7 @@ static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pa if (res > 0) { for (j=0; j < res; j++) page_cache_release(pages[j]); + res = 0; } kfree(pages); return res; @@ -4524,8 +4525,6 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_p for (i=0; i < nr_pages; i++) { struct page *page = sgl[i].page; - /* XXX: just for debug. Remove when PageReserved is removed */ - BUG_ON(PageReserved(page)); if (dirtied) SetPageDirty(page); /* FIXME: cache flush missing for rw==READ |