Skip to content

Commit

Permalink
xen: use less generic names in blkfront driver.
Browse files Browse the repository at this point in the history
All Xen frontend drivers have a couple of identically named functions which
makes figuring out which device went wrong from a stacktrace harder than it
needs to be. Rename them to something specificto the device type.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  • Loading branch information
Ian Campbell authored and Jens Axboe committed Aug 7, 2010
1 parent 96dccab commit 203fd61
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/block/xen-blkfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ static int setup_blkring(struct xenbus_device *dev,


/* Common code used when first setting up, and when resuming. */
static int talk_to_backend(struct xenbus_device *dev,
static int talk_to_blkback(struct xenbus_device *dev,
struct blkfront_info *info)
{
const char *message = NULL;
Expand Down Expand Up @@ -756,7 +756,7 @@ static int blkfront_probe(struct xenbus_device *dev,
info->handle = simple_strtoul(strrchr(dev->nodename, '/')+1, NULL, 0);
dev_set_drvdata(&dev->dev, info);

err = talk_to_backend(dev, info);
err = talk_to_blkback(dev, info);
if (err) {
kfree(info);
dev_set_drvdata(&dev->dev, NULL);
Expand Down Expand Up @@ -851,7 +851,7 @@ static int blkfront_resume(struct xenbus_device *dev)

blkif_free(info, info->connected == BLKIF_STATE_CONNECTED);

err = talk_to_backend(dev, info);
err = talk_to_blkback(dev, info);
if (info->connected == BLKIF_STATE_SUSPENDED && !err)
err = blkif_recover(info);

Expand Down Expand Up @@ -955,13 +955,13 @@ static void blkfront_closing(struct xenbus_device *dev)
/**
* Callback received when the backend's state changes.
*/
static void backend_changed(struct xenbus_device *dev,
static void blkback_changed(struct xenbus_device *dev,
enum xenbus_state backend_state)
{
struct blkfront_info *info = dev_get_drvdata(&dev->dev);
struct block_device *bd;

dev_dbg(&dev->dev, "blkfront:backend_changed.\n");
dev_dbg(&dev->dev, "blkfront:blkback_changed to state %d.\n", backend_state);

switch (backend_state) {
case XenbusStateInitialising:
Expand Down Expand Up @@ -1068,7 +1068,7 @@ static struct xenbus_driver blkfront = {
.probe = blkfront_probe,
.remove = blkfront_remove,
.resume = blkfront_resume,
.otherend_changed = backend_changed,
.otherend_changed = blkback_changed,
.is_ready = blkfront_is_ready,
};

Expand Down

0 comments on commit 203fd61

Please sign in to comment.