Commit 89c63a8e authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'stable/for-jens' of... 

Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
parents 65299a3b 1bc05b0a

drivers/block/xen-blkback/xenbus.c

+3 −3
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static void frontend_changed(struct xenbus_device *dev, 


		/*

		 * Enforce precondition before potential leak point.

		 * blkif_disconnect() is idempotent.

		 * xen_blkif_disconnect() is idempotent.

		 */

		xen_blkif_disconnect(be->blkif);
@@ -601,17 +601,17 @@ static void frontend_changed(struct xenbus_device *dev, 
		break;



	case XenbusStateClosing:

		xen_blkif_disconnect(be->blkif);

		xenbus_switch_state(dev, XenbusStateClosing);

		break;



	case XenbusStateClosed:

		xen_blkif_disconnect(be->blkif);

		xenbus_switch_state(dev, XenbusStateClosed);

		if (xenbus_dev_is_online(dev))

			break;

		/* fall through if not online */

	case XenbusStateUnknown:

		/* implies blkif_disconnect() via blkback_remove() */

		/* implies xen_blkif_disconnect() via xen_blkbk_remove() */

		device_unregister(&dev->dev);

		break;

drivers/block/xen-blkback/common.h

+1 −1

File changed.

Contains only whitespace changes.