[Xen-changelog] [qemu-upstream-unstable] Xen, mapcache: Fix the compute of the size of bucket.

[patchbot@xxxxxxx]

commit 0ec445db3137e501e758a50d64e9c2b39d23a6b6
Author: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Date:   Fri Apr 13 17:18:56 2012 +0000

    Xen, mapcache: Fix the compute of the size of bucket.
    
    Because the size of a mapping is wrong when there is an offset and a
    size >= bucket_size.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 xen-mapcache.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xen-mapcache.c b/xen-mapcache.c
index d5f52b2..eade816 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -214,12 +214,14 @@ tryagain:
     }
 
     /* size is always a multiple of MCACHE_BUCKET_SIZE */
-    if ((address_offset + (__size % MCACHE_BUCKET_SIZE)) > MCACHE_BUCKET_SIZE)
-        __size += MCACHE_BUCKET_SIZE;
-    if (__size % MCACHE_BUCKET_SIZE)
-        __size += MCACHE_BUCKET_SIZE - (__size % MCACHE_BUCKET_SIZE);
-    if (!__size)
+    if (size) {
+        __size = size + address_offset;
+        if (__size % MCACHE_BUCKET_SIZE) {
+            __size += MCACHE_BUCKET_SIZE - (__size % MCACHE_BUCKET_SIZE);
+        }
+    } else {
         __size = MCACHE_BUCKET_SIZE;
+    }
 
     entry = &mapcache->entry[address_index % mapcache->nr_buckets];
 
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog