diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-12-02 16:59:59 +0100 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-02 17:24:14 +0100 |
| commit | 032c09d76cdb448484859cc84dac4bba8f5f8f14 (patch) | |
| tree | d6dded3df8c7240a17554b25ece04c9c766e21af /drivers/scsi/sg.c | |
| parent | [SCSI] st: fix a bug in sgl_map_user_pages failure path (diff) | |
| download | linux-032c09d76cdb448484859cc84dac4bba8f5f8f14.tar.xz linux-032c09d76cdb448484859cc84dac4bba8f5f8f14.zip | |
[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>
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 72ec59456e69..6de7ff9faf2d 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); */ |