# HG changeset patch
# User dgm36@ise.cl.cam.ac.uk
# Date 1201130148 0
# Node ID fff68c1acc8c89c42cf294924fc48d30dbb10454
# Parent  947e0701cf7aecce9e1b391f5dadbb5024e48e12
Fixed error in compress_free_list.

diff -r 947e0701cf7a -r fff68c1acc8c drivers/xen/gntdev/gntdev.c
--- a/drivers/xen/gntdev/gntdev.c	Tue Jan 22 21:52:44 2008 +0000
+++ b/drivers/xen/gntdev/gntdev.c	Wed Jan 23 23:15:48 2008 +0000
@@ -215,6 +215,8 @@ static int add_grant_reference(struct fi
 	}
 
 	slot_index = private_data->free_list[--private_data->free_list_size];
+	private_data->free_list[private_data->free_list_size]
+		= GNTDEV_FREE_LIST_INVALID;
 
 	/* Copy the grant information into file's private data. */
 	private_data->grants[slot_index].state = GNTDEV_SLOT_NOT_YET_MAPPED;
@@ -271,13 +273,19 @@ static void compress_free_list(struct fi
 {
 	gntdev_file_private_data_t *private_data 
 		= (gntdev_file_private_data_t *) flip->private_data;
-	int i, j = 0, old_size;
+	int i, j = 0, old_size, slot_index;
 	
 	old_size = private_data->free_list_size;
 	for (i = 0; i < old_size; ++i) {
 		if (private_data->free_list[i] != GNTDEV_FREE_LIST_INVALID) {
-			private_data->free_list[j] = 
-				private_data->free_list[i];
+			if (i > j) {
+				slot_index = private_data->free_list[i];
+				private_data->free_list[j] = slot_index;
+				private_data->grants[slot_index].u
+					.free_list_index = j;
+				private_data->free_list[i] 
+					= GNTDEV_FREE_LIST_INVALID;
+			}
 			++j;
 		} else {
 			--private_data->free_list_size;
@@ -908,7 +916,6 @@ static long gntdev_ioctl(struct file *fl
 				start_index + i;
 			++private_data->free_list_size;
 		}
-		compress_free_list(flip);
 
 	unmap_out:
 		up_write(&private_data->grants_sem);