diff options
| author | Fam Zheng <famz@redhat.com> | 2016-01-26 11:59:00 +0800 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-02 17:50:47 +0100 |
| commit | ac987b30d0a97f14b82584921fc5ab3cd88c431b (patch) | |
| tree | ccdb69753de73c1aa25839af5ac9f0fabd7f4ed0 | |
| parent | e0f100f57ceee919a7df7af316961b175ffef4e6 (diff) | |
block: Use returned *file in bdrv_co_get_block_status
Now that all drivers return the right "file" pointer, we can use it.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1453780743-16806-14-git-send-email-famz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/io.c b/block/io.c index ea040bef22..343ff1f233 100644 --- a/block/io.c +++ b/block/io.c @@ -1554,13 +1554,13 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, } } - if (bs->file && + if (*file && *file != bs && (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && (ret & BDRV_BLOCK_OFFSET_VALID)) { BlockDriverState *file2; int file_pnum; - ret2 = bdrv_co_get_block_status(bs->file->bs, ret >> BDRV_SECTOR_BITS, + ret2 = bdrv_co_get_block_status(*file, ret >> BDRV_SECTOR_BITS, *pnum, &file_pnum, &file2); if (ret2 >= 0) { /* Ignore errors. This is just providing extra information, it |