block: Fix bdrv_commit
PATCH 1/1 block: Fix bdrv_commit
When reopening the image, don't guess the driver, but use the same driver as was used before. This is important if the format=... option was used for that image.
Signed-off-by Kevin Wolf <[email protected]>
--- block.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
block.c +3 -3
@@ -701,12 +701,12 @@ int bdrv_commit(BlockDriverState *bs)bdrv_delete (bs->backing_hd); bs->backing_hd =NULL ; bs_rw =bdrv_new ("" ); - rw_ret =bdrv_open (bs_rw, filename, open_flags |BDRV_O_RDWR ,NULL ); + rw_ret =bdrv_open (bs_rw, filename, open_flags |BDRV_O_RDWR , drv);if (rw_ret <0 ) {bdrv_delete (bs_rw);/* try to re-open read-only */ bs_ro =bdrv_new ("" ); - ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR ,NULL ); + ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR , drv);if (ret <0 ) {bdrv_delete (bs_ro);/* drive not functional anymore */
@@ -758,7 +758,7 @@ ro_cleanup:bdrv_delete (bs->backing_hd); bs->backing_hd =NULL ; bs_ro =bdrv_new ("" ); - ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR ,NULL ); + ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR , drv);if (ret <0 ) {bdrv_delete (bs_ro);/* drive not functional anymore */
Signature · 1 line
1.6.6.1
Quoted 29 lines · Kevin Wolf
When reopening the image, don't guess the driver, but use the same driver as was used before. This is important if the format=... option was used for that image.
Signed-off-by Kevin Wolf <[email protected]>--- block.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)block.c +2
-2@@ -701,12 +701,12 @@ int bdrv_commit(BlockDriverState *bs)bdrv_delete (bs->backing_hd); bs->backing_hd =NULL ; bs_rw =bdrv_new ("" ); - rw_ret =bdrv_open (bs_rw, filename, open_flags |BDRV_O_RDWR ,NULL ); + rw_ret =bdrv_open (bs_rw, filename, open_flags |BDRV_O_RDWR , drv);if (rw_ret <0 ) {bdrv_delete (bs_rw);/* try to re-open read-only */ bs_ro =bdrv_new ("" ); - ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR ,NULL ); + ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR , drv);if (ret <0 ) {bdrv_delete (bs_ro);/* drive not functional anymore */
block.c ro_cleanup: · line 764
Quoted 8 lines
block.c +1
-1@@ -758,7 +758,7 @@ ro_cleanup:bdrv_delete (bs->backing_hd); bs->backing_hd =NULL ; bs_ro =bdrv_new ("" ); - ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR ,NULL ); + ret =bdrv_open (bs_ro, filename, open_flags & ~BDRV_O_RDWR , drv);if (ret <0 ) {bdrv_delete (bs_ro);/* drive not functional anymore */
Acked-by Naphtali Sprei <[email protected]>
Quoted 5 lines · Kevin Wolf
When reopening the image, don't guess the driver, but use the same driver as was used before. This is important if the format=... option was used for that image.
Signed-off-by Kevin Wolf <[email protected]>
Looks good,
Reviewed-by Christoph Hellwig <[email protected]>