Commit e345d767 authored by Jens Axboe's avatar Jens Axboe

Merge branch 'stable/for-jens-3.13-take-two' of...

Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into for-linus
parents c170bbb4 2f089cb8
...@@ -489,7 +489,7 @@ static int blkif_queue_request(struct request *req) ...@@ -489,7 +489,7 @@ static int blkif_queue_request(struct request *req)
if ((ring_req->operation == BLKIF_OP_INDIRECT) && if ((ring_req->operation == BLKIF_OP_INDIRECT) &&
(i % SEGS_PER_INDIRECT_FRAME == 0)) { (i % SEGS_PER_INDIRECT_FRAME == 0)) {
unsigned long pfn; unsigned long uninitialized_var(pfn);
if (segments) if (segments)
kunmap_atomic(segments); kunmap_atomic(segments);
...@@ -2011,6 +2011,10 @@ static void blkif_release(struct gendisk *disk, fmode_t mode) ...@@ -2011,6 +2011,10 @@ static void blkif_release(struct gendisk *disk, fmode_t mode)
bdev = bdget_disk(disk, 0); bdev = bdget_disk(disk, 0);
if (!bdev) {
WARN(1, "Block device %s yanked out from us!\n", disk->disk_name);
goto out_mutex;
}
if (bdev->bd_openers) if (bdev->bd_openers)
goto out; goto out;
...@@ -2041,6 +2045,7 @@ static void blkif_release(struct gendisk *disk, fmode_t mode) ...@@ -2041,6 +2045,7 @@ static void blkif_release(struct gendisk *disk, fmode_t mode)
out: out:
bdput(bdev); bdput(bdev);
out_mutex:
mutex_unlock(&blkfront_mutex); mutex_unlock(&blkfront_mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment