diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 13:49:44 -0800 |
| commit | bcd039b230f738243193ef7dbb03298d967b8370 (patch) | |
| tree | bec1988fa1d7f8dbcd445a82ad68c27330df03a9 /drivers | |
| parent | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff) | |
| parent | 6f5a0f7c955d3567f800fa36f978758cb5b99aa2 (diff) | |
| download | kernel_samsung_smdk4412-bcd039b230f738243193ef7dbb03298d967b8370.zip kernel_samsung_smdk4412-bcd039b230f738243193ef7dbb03298d967b8370.tar.gz kernel_samsung_smdk4412-bcd039b230f738243193ef7dbb03298d967b8370.tar.bz2 | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/cciss.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e239a6c..a9e33db 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1017,10 +1017,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, status = -ENOMEM; goto cleanup1; } - if (ioc->Request.Type.Direction == XFER_WRITE && - copy_from_user(buff[sg_used], data_ptr, sz)) { + if (ioc->Request.Type.Direction == XFER_WRITE) { + if (copy_from_user(buff[sg_used], data_ptr, sz)) { status = -ENOMEM; - goto cleanup1; + goto cleanup1; + } } else { memset(buff[sg_used], 0, sz); } @@ -1138,8 +1139,15 @@ static int revalidate_allvol(ctlr_info_t *host) for(i=0; i< NWD; i++) { struct gendisk *disk = host->gendisk[i]; - if (disk->flags & GENHD_FL_UP) - del_gendisk(disk); + if (disk) { + request_queue_t *q = disk->queue; + + if (disk->flags & GENHD_FL_UP) + del_gendisk(disk); + if (q) + blk_cleanup_queue(q); + put_disk(disk); + } } /* @@ -1453,10 +1461,13 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, * allows us to delete disk zero but keep the controller registered. */ if (h->gendisk[0] != disk){ - if (disk->flags & GENHD_FL_UP){ - blk_cleanup_queue(disk->queue); - del_gendisk(disk); - drv->queue = NULL; + if (disk) { + request_queue_t *q = disk->queue; + if (disk->flags & GENHD_FL_UP) + del_gendisk(disk); + if (q) + blk_cleanup_queue(q); + put_disk(disk); } } @@ -3225,9 +3236,14 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev) /* remove it from the disk list */ for (j = 0; j < NWD; j++) { struct gendisk *disk = hba[i]->gendisk[j]; - if (disk->flags & GENHD_FL_UP) { - del_gendisk(disk); - blk_cleanup_queue(disk->queue); + if (disk) { + request_queue_t *q = disk->queue; + + if (disk->flags & GENHD_FL_UP) + del_gendisk(disk); + if (q) + blk_cleanup_queue(q); + put_disk(disk); } } |