[Xen-changelog] [linux-2.6.18-xen] blktap2: fix after c/s 1035

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1290014212 0
# Node ID e73077b6d6bfe8f9073c2059671be7c9c391a194
# Parent  c72ead7ec5953e8bb702b4b025296e8de8321195
blktap2: fix after c/s 1035

The grant handle must be invalidated only in the error path.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Acked-by: Olaf Hering <olaf@xxxxxxxxx>
---
 drivers/xen/blktap2/device.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r c72ead7ec595 -r e73077b6d6bf drivers/xen/blktap2/device.c
--- a/drivers/xen/blktap2/device.c      Tue Nov 16 11:32:04 2010 +0000
+++ b/drivers/xen/blktap2/device.c      Wed Nov 17 17:16:52 2010 +0000
@@ -523,8 +523,8 @@ blktap_map_foreign(struct blktap *tap,
                                WARN_ON(table->grants[grant].status == 
GNTST_eagain);
                                BTERR("invalid user buffer: could not remap 
it\n");
                                err |= 1;
+                               table->grants[grant].handle = 
INVALID_GRANT_HANDLE;
                        }
-                       table->grants[grant].handle = INVALID_GRANT_HANDLE;
                        request->handles[i].user = table->grants[grant].handle;
                        grant++;
                }

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