xen/grant: introduce func gnttab_unmap_refs_sync()

There are several place using gnttab async unmap and wait for
completion, so move the common code to a function
gnttab_unmap_refs_sync().

Signed-off-by: Bob Liu <bob.liu@oracle.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

1 files changed, 3 insertions, 25 deletions

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index d5bb1a33d0a3..89274850741b 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -327,30 +327,10 @@ static int map_grant_pages(struct grant_map *map)
         return err;
 }
 
-struct unmap_grant_pages_callback_data
-{
-        struct completion completion;
-        int result;
-};
-
-static void unmap_grant_callback(int result,
-                                 struct gntab_unmap_queue_data *data)
-{
-        struct unmap_grant_pages_callback_data* d = data->data;
-
-        d->result = result;
-        complete(&d->completion);
-}
-
 static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
 {
         int i, err = 0;
         struct gntab_unmap_queue_data unmap_data;
-        struct unmap_grant_pages_callback_data data;
-
-        init_completion(&data.completion);
-        unmap_data.data = &data;
-        unmap_data.done= &unmap_grant_callback;
 
         if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {
                 int pgno = (map->notify.addr >> PAGE_SHIFT);
@@ -367,11 +347,9 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
         unmap_data.pages = map->pages + offset;
         unmap_data.count = pages;
 
-        gnttab_unmap_refs_async(&unmap_data);
-
-        wait_for_completion(&data.completion);
-        if (data.result)
-                return data.result;
+        err = gnttab_unmap_refs_sync(&unmap_data);
+        if (err)
+                return err;
 
         for (i = 0; i < pages; i++) {
                 if (map->unmap_ops[offset+i].status)