| Message ID | 1345028238-9622-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Aug 15, 2012 at 11:57 AM, Kevin Wolf <kwolf@redhat.com> wrote: > Commit 29cdb251 already added a comment that no unnecessary flushes to > disk will occur, this patch makes the code even get to the point of the > comment. This is mostly theoretical because in practice we only stack > one format on top of one protocol, the former implementing flush_to_os > and the latter only flush_to_disk. It starts to matter when drivers that > are not on top implement flush_to_os. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > block.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
diff --git a/block.c b/block.c index 016858b..470bdcc 100644 --- a/block.c +++ b/block.c @@ -3534,7 +3534,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) /* But don't actually force it to the disk with cache=unsafe */ if (bs->open_flags & BDRV_O_NO_FLUSH) { - return 0; + goto flush_parent; } if (bs->drv->bdrv_co_flush_to_disk) { @@ -3573,6 +3573,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) /* Now flush the underlying protocol. It will also have BDRV_O_NO_FLUSH * in the case of cache=unsafe, so there are no useless flushes. */ +flush_parent: return bdrv_co_flush(bs->file); }
Commit 29cdb251 already added a comment that no unnecessary flushes to disk will occur, this patch makes the code even get to the point of the comment. This is mostly theoretical because in practice we only stack one format on top of one protocol, the former implementing flush_to_os and the latter only flush_to_disk. It starts to matter when drivers that are not on top implement flush_to_os. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)