diff --git a/[refs] b/[refs] index 3d62df8d035a..60bb4447a619 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5185432277ddf5bd91ad5af29cd1945f25ed10fc +refs/heads/master: 496b318eb65558c1a3a4fe882cb9da6d1dc6493a diff --git a/trunk/drivers/block/xen-blkback/blkback.c b/trunk/drivers/block/xen-blkback/blkback.c index 9dee5454740f..dba55e3a4a86 100644 --- a/trunk/drivers/block/xen-blkback/blkback.c +++ b/trunk/drivers/block/xen-blkback/blkback.c @@ -226,6 +226,7 @@ static void xen_vbd_resize(struct xen_blkif *blkif) goto again; if (err) pr_warn(DRV_PFX "Error ending transaction"); + return; abort: xenbus_transaction_end(xbt, 1); }