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

Jens Axboe · Jens Axboe · commit e3a57b3ccf5c · 2011-06-02T13:14:15.000+02:00
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
@@ -809,11 +809,13 @@ static int __init xen_blkif_init(void)
  failed_init:
 	kfree(blkbk->pending_reqs);
 	kfree(blkbk->pending_grant_handles);
-	for (i = 0; i < mmap_pages; i++) {
-		if (blkbk->pending_pages[i])
-			__free_page(blkbk->pending_pages[i]);
+	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->pending_pages);
 	kfree(blkbk);
 	blkbk = NULL;
 	return rc;
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -357,14 +357,13 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`vbd->bdev = bdev;`
`360`		`- vbd->size = vbd_sz(vbd);`
`361`		`-`
`362`	`360`	`if (vbd->bdev->bd_disk == NULL) {`
`363`	`361`	`DPRINTK("xen_vbd_create: device %08x doesn't exist.\n",`
`364`	`362`	`vbd->pdevice);`
`365`	`363`	`xen_vbd_free(vbd);`
`366`	`364`	`return -ENOENT;`
`367`	`365`	`}`
	`366`	`+ vbd->size = vbd_sz(vbd);`
`368`	`367`
`369`	`368`	`if (vbd->bdev->bd_disk->flags & GENHD_FL_CD \|\| cdrom)`
`370`	`369`	`vbd->type \|= VDISK_CDROM;`