From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 14 Jan 2013 15:26:53 +0000 (+0100)
Subject: raw-posix: remember whether discard failed
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~1400^2~11
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c85191e5c9e14d65cc4281ef3b31f480227aa6dd;p=qemu-upstream-4.6-testing.git

raw-posix: remember whether discard failed

Avoid sending system calls repeatedly if they shall fail.  This
does not apply to XFS: if the filesystem-specific ioctl fails,
something weird is happening.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block/raw-posix.c b/block/raw-posix.c
index e8d79afe5..b647cfbb2 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -141,6 +141,7 @@ typedef struct BDRVRawState {
 #ifdef CONFIG_XFS
     bool is_xfs : 1;
 #endif
+    bool has_discard : 1;
 } BDRVRawState;
 
 typedef struct BDRVRawReopenState {
@@ -292,6 +293,7 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
     }
 #endif
 
+    s->has_discard = 1;
 #ifdef CONFIG_XFS
     if (platform_test_xfs_fd(s->fd)) {
         s->is_xfs = 1;
@@ -1078,10 +1080,12 @@ static coroutine_fn int raw_co_discard(BlockDriverState *bs,
     int64_t sector_num, int nb_sectors)
 {
     int ret = -EOPNOTSUPP;
-
-#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) || defined(CONFIG_XFS)
     BDRVRawState *s = bs->opaque;
 
+    if (!s->has_discard) {
+        return 0;
+    }
+
 #ifdef CONFIG_XFS
     if (s->is_xfs) {
         return xfs_discard(s, sector_num, nb_sectors);
@@ -1098,7 +1102,6 @@ static coroutine_fn int raw_co_discard(BlockDriverState *bs,
     } while (errno == EINTR);
 
     ret = -errno;
-#endif
 #endif
 
     if (ret == -EOPNOTSUPP) {