diff options
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 927d700f0073..da9766283bd7 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -4377,7 +4377,7 @@ static void do_create_class_files(struct scsi_tape *STp, int dev_num, int mode) | |||
4377 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", | 4377 | snprintf(name, 10, "%s%s%s", rew ? "n" : "", |
4378 | STp->disk->disk_name, st_formats[i]); | 4378 | STp->disk->disk_name, st_formats[i]); |
4379 | st_class_member = | 4379 | st_class_member = |
4380 | class_device_create(st_sysfs_class, | 4380 | class_device_create(st_sysfs_class, NULL, |
4381 | MKDEV(SCSI_TAPE_MAJOR, | 4381 | MKDEV(SCSI_TAPE_MAJOR, |
4382 | TAPE_MINOR(dev_num, mode, rew)), | 4382 | TAPE_MINOR(dev_num, mode, rew)), |
4383 | &STp->device->sdev_gendev, "%s", name); | 4383 | &STp->device->sdev_gendev, "%s", name); |
@@ -4526,12 +4526,16 @@ static int sgl_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_p | |||
4526 | int i; | 4526 | int i; |
4527 | 4527 | ||
4528 | for (i=0; i < nr_pages; i++) { | 4528 | for (i=0; i < nr_pages; i++) { |
4529 | if (dirtied && !PageReserved(sgl[i].page)) | 4529 | struct page *page = sgl[i].page; |
4530 | SetPageDirty(sgl[i].page); | 4530 | |
4531 | /* XXX: just for debug. Remove when PageReserved is removed */ | ||
4532 | BUG_ON(PageReserved(page)); | ||
4533 | if (dirtied) | ||
4534 | SetPageDirty(page); | ||
4531 | /* FIXME: cache flush missing for rw==READ | 4535 | /* FIXME: cache flush missing for rw==READ |
4532 | * FIXME: call the correct reference counting function | 4536 | * FIXME: call the correct reference counting function |
4533 | */ | 4537 | */ |
4534 | page_cache_release(sgl[i].page); | 4538 | page_cache_release(page); |
4535 | } | 4539 | } |
4536 | 4540 | ||
4537 | return 0; | 4541 | return 0; |