[Xen-changelog] [qemu-xen stable-4.10] util/stats64: Fix min/max comparisons

[patchbot@xxxxxxx]

commit d6c99e8ff5c7e46ced686c7773cd9c5faf3e844e
Author:     Max Reitz <mreitz@xxxxxxxxxx>
AuthorDate: Wed Nov 15 00:22:23 2017 +0100
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Dec 6 09:53:22 2017 -0600

    util/stats64: Fix min/max comparisons
    
    stat64_min_slow() and stat64_max_slow() compare the wrong way.  This
    makes iotest 136 fail with clang and -m32.
    
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    Message-Id: <20171114232223.25207-1-mreitz@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 26a5db322be1e424a815d070ddd04442a5e5df50)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 util/stats64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/stats64.c b/util/stats64.c
index 9968fcc..389c365 100644
--- a/util/stats64.c
+++ b/util/stats64.c
@@ -91,7 +91,7 @@ bool stat64_min_slow(Stat64 *s, uint64_t value)
     low = atomic_read(&s->low);
 
     orig = ((uint64_t)high << 32) | low;
-    if (orig < value) {
+    if (value < orig) {
         /* We have to set low before high, just like stat64_min reads
          * high before low.  The value may become higher temporarily, but
          * stat64_get does not notice (it takes the lock) and the only ill
@@ -120,7 +120,7 @@ bool stat64_max_slow(Stat64 *s, uint64_t value)
     low = atomic_read(&s->low);
 
     orig = ((uint64_t)high << 32) | low;
-    if (orig > value) {
+    if (value > orig) {
         /* We have to set low before high, just like stat64_max reads
          * high before low.  The value may become lower temporarily, but
          * stat64_get does not notice (it takes the lock) and the only ill
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog