xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Xen-devel <xen-devel@lists.xensource.com>,
	Ian Campbell <ian.campbell@citrix.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Subject: [PATCH 01/16] xen: use less generic names in blkfront driver.
Date: Tue, 20 Jul 2010 13:42:08 -0700	[thread overview]
Message-ID: <355e718c3f164de385d165eb8a0594895f034ebd.1279658433.git.jeremy.fitzhardinge@citrix.com> (raw)
In-Reply-To: <cover.1279658231.git.jeremy.fitzhardinge@citrix.com>

From: Ian Campbell <ian.campbell@citrix.com>

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>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
 drivers/block/xen-blkfront.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 82ed403..6839947 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -651,7 +651,7 @@ fail:
 
 
 /* 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;
@@ -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);
@@ -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);
 
@@ -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:
@@ -1062,7 +1062,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,
 };
 
-- 
1.7.1.1

       reply	other threads:[~2010-07-20 20:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1279658231.git.jeremy.fitzhardinge@citrix.com>
2010-07-20 20:42 ` Jeremy Fitzhardinge [this message]
2010-07-20 20:42   ` [PATCH 02/16] blkfront: fixes for 'xm block-detach ... --force' Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 03/16] blkfront: don't access freed struct xenbus_device Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 04/16] xen/front: Propagate changed size of VBDs Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 05/16] xen/blkfront: avoid compiler warning from missing cases Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 06/16] xen/blkfront: revalidate after setting capacity Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 07/16] xenbus: Make xenbus_switch_state transactional Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 08/16] blkfront: Fix backtrace in del_gendisk Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 09/16] blkfront: Fix gendisk leak Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 10/16] blkfront: Clean up vbd release Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 11/16] blkfront: Lock blkfront_info when closing Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 12/16] blkfront: Fix blkfront backend switch race (bdev open) Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 13/16] blkfront: Fix blkfront backend switch race (bdev release) Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 14/16] blkfront: Lock blockfront_info during xbdev removal Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 15/16] blkfront: Remove obsolete info->users Jeremy Fitzhardinge
2010-07-20 20:42   ` [PATCH 16/16] blkfront: Klog the unclean release path Jeremy Fitzhardinge
2010-07-21  2:12 ` [PATCH 00/16] xen/blkfront: various bugfixes and patches for blkfront Jens Axboe
2010-07-21  5:03   ` Jeremy Fitzhardinge
2010-07-29  0:26   ` Jeremy Fitzhardinge
2010-08-02 17:45     ` Jeremy Fitzhardinge
2010-08-02 18:40       ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=355e718c3f164de385d165eb8a0594895f034ebd.1279658433.git.jeremy.fitzhardinge@citrix.com \
    --to=jeremy@goop.org \
    --cc=axboe@kernel.dk \
    --cc=ian.campbell@citrix.com \
    --cc=jeremy.fitzhardinge@citrix.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).