]> xenbits.xensource.com Git - people/dstodden/blktap.git/commitdiff
CA-51905: Preserve vbd->flags.
authorDaniel Stodden <daniel.stodden@citrix.com>
Sat, 16 Apr 2011 00:31:02 +0000 (17:31 -0700)
committerDaniel Stodden <daniel.stodden@citrix.com>
Sat, 16 Apr 2011 00:31:02 +0000 (17:31 -0700)
Ugh, more fallout after 608:1feb6ca365ef.

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

index f7641c9d2d7a149ef76f8d2440d8b4b111cc36e1..74bc1b92a0069f1fa9084199c7fbcdf011cf030e 100644 (file)
@@ -449,6 +449,9 @@ tapdisk_vbd_open_vdi(td_vbd_t *vbd, const char *name, td_flag_t flags, int prt_d
        if (err)
                goto fail;
 
+       td_flag_clear(vbd->state, TD_VBD_CLOSED);
+       vbd->flags = flags;
+
        if (td_flag_test(vbd->flags, TD_OPEN_LOG_DIRTY)) {
                err = tapdisk_vbd_add_dirty_log(vbd);
                if (err)
@@ -477,10 +480,6 @@ tapdisk_vbd_open_vdi(td_vbd_t *vbd, const char *name, td_flag_t flags, int prt_d
                        goto fail;
        }
 
-       td_flag_clear(vbd->state, TD_VBD_CLOSED);
-
-       vbd->flags = flags;
-
        if (tmp != vbd->name)
                free(tmp);