]> xenbits.xensource.com Git - people/dstodden/blktap.git/commitdiff
control: Fix borked td create shutdown path.
authorDaniel Stodden <daniel.stodden@citrix.com>
Wed, 13 Jul 2011 20:53:51 +0000 (13:53 -0700)
committerDaniel Stodden <daniel.stodden@citrix.com>
Wed, 13 Jul 2011 21:00:37 +0000 (14:00 -0700)
Aiee, don't free the VBD when failing VDI open.

But free the name (we require it to be NULL on entry), so
tap-ctl-create can cleanly detach on rollback path.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
drivers/tapdisk-control.c

index fe4b674e347c741ee679b180a0529f047d16ca23..a669d04e1d52bd675733b7779b25c3a7205dbebe 100644 (file)
@@ -773,7 +773,12 @@ out:
 
 fail_close:
        tapdisk_vbd_close_vdi(vbd);
-       free(vbd);
+
+       if (vbd->name) {
+               free(vbd->name);
+               vbd->name = NULL;
+       }
+
        goto out;
 }