Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
xen/blkfront: use xenbus_setup_ring() and xenbus_teardown_ring()
Simplify blkfront's ring creation and removal via xenbus_setup_ring()
and xenbus_teardown_ring().
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
+8
-29
+8
-29
drivers/block/xen-blkfront.c
+8
-29
drivers/block/xen-blkfront.c
···
1280
1280
flush_work(&rinfo->work);
1281
1281
1282
1282
/* Free resources associated with old device channel. */
1283
-
for (i = 0; i < info->nr_ring_pages; i++) {
1284
-
if (rinfo->ring_ref[i] != INVALID_GRANT_REF) {
1285
-
gnttab_end_foreign_access(rinfo->ring_ref[i], 0);
1286
-
rinfo->ring_ref[i] = INVALID_GRANT_REF;
1287
-
}
1288
-
}
1289
-
free_pages_exact(rinfo->ring.sring,
1290
-
info->nr_ring_pages * XEN_PAGE_SIZE);
1291
-
rinfo->ring.sring = NULL;
1283
+
xenbus_teardown_ring((void **)&rinfo->ring.sring, info->nr_ring_pages,
1284
+
rinfo->ring_ref);
1292
1285
1293
1286
if (rinfo->irq)
1294
1287
unbind_from_irqhandler(rinfo->irq, rinfo);
···
1672
1679
struct blkfront_ring_info *rinfo)
1673
1680
{
1674
1681
struct blkif_sring *sring;
1675
-
int err, i;
1682
+
int err;
1676
1683
struct blkfront_info *info = rinfo->dev_info;
1677
1684
unsigned long ring_size = info->nr_ring_pages * XEN_PAGE_SIZE;
1678
-
grant_ref_t gref[XENBUS_MAX_RING_GRANTS];
1679
1685
1680
-
for (i = 0; i < info->nr_ring_pages; i++)
1681
-
rinfo->ring_ref[i] = INVALID_GRANT_REF;
1682
-
1683
-
sring = alloc_pages_exact(ring_size, GFP_NOIO);
1684
-
if (!sring) {
1685
-
xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
1686
-
return -ENOMEM;
1687
-
}
1688
-
SHARED_RING_INIT(sring);
1689
-
FRONT_RING_INIT(&rinfo->ring, sring, ring_size);
1690
-
1691
-
err = xenbus_grant_ring(dev, rinfo->ring.sring, info->nr_ring_pages, gref);
1692
-
if (err < 0) {
1693
-
free_pages_exact(sring, ring_size);
1694
-
rinfo->ring.sring = NULL;
1686
+
err = xenbus_setup_ring(dev, GFP_NOIO, (void **)&sring,
1687
+
info->nr_ring_pages, rinfo->ring_ref);
1688
+
if (err)
1695
1689
goto fail;
1696
-
}
1697
-
for (i = 0; i < info->nr_ring_pages; i++)
1698
-
rinfo->ring_ref[i] = gref[i];
1690
+
1691
+
XEN_FRONT_RING_INIT(&rinfo->ring, sring, ring_size);
1699
1692
1700
1693
err = xenbus_alloc_evtchn(dev, &rinfo->evtchn);
1701
1694
if (err)