diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-12-02 15:59:59 +0000 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-02 10:24:14 -0600 |
| commit | 032c09d76cdb448484859cc84dac4bba8f5f8f14 (patch) | |
| tree | d6dded3df8c7240a17554b25ece04c9c766e21af | |
| parent | 6bc733e9f71c937f3c64159bf1e569321726a44c (diff) | |
| download | kernel_samsung_espresso10-032c09d76cdb448484859cc84dac4bba8f5f8f14.zip kernel_samsung_espresso10-032c09d76cdb448484859cc84dac4bba8f5f8f14.tar.gz kernel_samsung_espresso10-032c09d76cdb448484859cc84dac4bba8f5f8f14.tar.bz2 | |
[SCSI] sg and st unmap_user_pages allow PageReserved
2.6.15-rc1 made sg's st_unmap_user_pages and st's sgl_unmap_user_pages
BUG on a PageReserved page. But that's wrong: they could be unmapping
the ZERO_PAGE, which is marked PG_reserved; and perhaps others (while
get_user_pages is still permitted on VM_PFNMAP areas - that may change).
More change is needed here: sg claims to dirty even pages written from,
and st claims not to dirty even pages read into; and SetPageDirty is not
adequate for this nowadays. Fixes to those follow in a later patch: for
the moment just fix the 2.6.15 regression.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/sg.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/st.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 72ec594..6de7ff9 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1878,8 +1878,6 @@ st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages, 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); /* unlock_page(page); */ diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index b1056d2..7ac6ea1 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -4525,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 |