From fecc88ec2c492abfdfbb0954ed9042f71c9a9fa2 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Sat, 9 Oct 2010 12:12:13 +1030 Subject: [PATCH] --- yaml --- r: 211376 b: refs/heads/master c: e4c4776dea9fd0295ebb3b215599d52938d6d7a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/virtio_blk.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 068c4ca8a9f1..ac3bad49d9a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b0cd00bc396daf5c2dcf17a8d82055335341f46 +refs/heads/master: e4c4776dea9fd0295ebb3b215599d52938d6d7a3 diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 2aafafca2b13..1101e251a629 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/drivers/block/virtio_blk.c @@ -202,6 +202,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) struct virtio_blk *vblk = disk->private_data; struct request *req; struct bio *bio; + int err; bio = bio_map_kern(vblk->disk->queue, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL); @@ -215,7 +216,10 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) } req->cmd_type = REQ_TYPE_SPECIAL; - return blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); + err = blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); + blk_put_request(req); + + return err; } static int virtblk_locked_ioctl(struct block_device *bdev, fmode_t mode,