Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a57b3c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-jens/xen-blkback.fixes' of... 

Merge branch 'for-jens/xen-blkback.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
parents e2bd9678 9b83c771

drivers/block/xen-blkback/blkback.c

+6 −4
Original line number Diff line number Diff line
@@ -809,11 +809,13 @@ static int __init xen_blkif_init(void) 
 failed_init:

	kfree(blkbk->pending_reqs);

	kfree(blkbk->pending_grant_handles);

	if (blkbk->pending_pages) {

		for (i = 0; i < mmap_pages; i++) {

			if (blkbk->pending_pages[i])

				__free_page(blkbk->pending_pages[i]);

		}

		kfree(blkbk->pending_pages);

	}

	kfree(blkbk);

	blkbk = NULL;

	return rc;

drivers/block/xen-blkback/xenbus.c

+1 −2
Original line number Diff line number Diff line
@@ -357,14 +357,13 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, 
	}



	vbd->bdev = bdev;

	vbd->size = vbd_sz(vbd);



	if (vbd->bdev->bd_disk == NULL) {

		DPRINTK("xen_vbd_create: device %08x doesn't exist.\n",

			vbd->pdevice);

		xen_vbd_free(vbd);

		return -ENOENT;

	}

	vbd->size = vbd_sz(vbd);



	if (vbd->bdev->bd_disk->flags & GENHD_FL_CD || cdrom)

		vbd->type |= VDISK_CDROM;