evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jens Axboe 2011-08-23 15:09:13 +02:00
commit 89c63a8ef3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/block/xen-blkback/xenbus.c
View file

@ -590,7 +590,7 @@ static void frontend_changed(struct xenbus_device *dev,
/* /*
* Enforce precondition before potential leak point. * Enforce precondition before potential leak point.
* blkif_disconnect() is idempotent. * xen_blkif_disconnect() is idempotent.
*/ */
xen_blkif_disconnect(be->blkif); xen_blkif_disconnect(be->blkif);
@ -601,17 +601,17 @@ static void frontend_changed(struct xenbus_device *dev,
break; break;
case XenbusStateClosing: case XenbusStateClosing:
xen_blkif_disconnect(be->blkif);
xenbus_switch_state(dev, XenbusStateClosing); xenbus_switch_state(dev, XenbusStateClosing);
break; break;
case XenbusStateClosed: case XenbusStateClosed:
xen_blkif_disconnect(be->blkif);
xenbus_switch_state(dev, XenbusStateClosed); xenbus_switch_state(dev, XenbusStateClosed);
if (xenbus_dev_is_online(dev)) if (xenbus_dev_is_online(dev))
break; break;
/* fall through if not online */ /* fall through if not online */
case XenbusStateUnknown: case XenbusStateUnknown:
/* implies blkif_disconnect() via blkback_remove() */ /* implies xen_blkif_disconnect() via xen_blkbk_remove() */
device_unregister(&dev->dev); device_unregister(&dev->dev);
break; break;