diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 14:32:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 14:32:44 -0800 |
| commit | 2741049e66d9698da5e0c90c849406fa3d3fc45c (patch) | |
| tree | 725c927121ccfe3eaa7df3b9b8e46610805f6b15 /drivers/scsi/st.c | |
| parent | 2a298a35ebe060a6f2b06b20c2a34ea188ddfd37 (diff) | |
| parent | 4d5cda069b3f0a3bbc18576bc15903ed665d0295 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
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 |