|
 |
9ae3a8 |
From 1e5cc3d3a5f9bf21d1df2967ac76b15d0e384950 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 18 Nov 2014 15:30:16 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 37/41] block/raw-posix: use seek_hole ahead of fiemap
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1416324620-16229-4-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 62438
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1/7.0.z qemu-kvm PATCH v3 3/7] block/raw-posix: use seek_hole ahead of fiemap
|
|
|
9ae3a8 |
Bugzilla: 1160237
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Tony Breeds <tony@bakeyournoodle.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
try_fiemap() uses FIEMAP_FLAG_SYNC which has a significant performance
|
|
|
9ae3a8 |
impact.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Prefer seek_hole() over fiemap() to avoid this impact where possible.
|
|
|
9ae3a8 |
seek_hole is more widely used and, arguably, has potential to be
|
|
|
9ae3a8 |
optimised in the kernel.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reported-By: Michael Steffens <michael_steffens@posteo.de>
|
|
|
9ae3a8 |
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
|
|
|
9ae3a8 |
Cc: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Cc: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Cc: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Cc: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Cc: Pádraig Brady <pbrady@redhat.com>
|
|
|
9ae3a8 |
Cc: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 7c15903789953ead14a417882657d52dc0c19a24)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/raw-posix.c | 4 ++--
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/raw-posix.c b/block/raw-posix.c
|
|
|
9ae3a8 |
index 8d31628..781ebf3 100644
|
|
|
9ae3a8 |
--- a/block/raw-posix.c
|
|
|
9ae3a8 |
+++ b/block/raw-posix.c
|
|
|
9ae3a8 |
@@ -1414,9 +1414,9 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
start = sector_num * BDRV_SECTOR_SIZE;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- ret = try_fiemap(bs, start, &data, &hole, nb_sectors, pnum);
|
|
|
9ae3a8 |
+ ret = try_seek_hole(bs, start, &data, &hole, pnum);
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
- ret = try_seek_hole(bs, start, &data, &hole, pnum);
|
|
|
9ae3a8 |
+ ret = try_fiemap(bs, start, &data, &hole, nb_sectors, pnum);
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
/* Assume everything is allocated. */
|
|
|
9ae3a8 |
data = 0;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|