patch revert-linux-2.6.18-xen.hg-582.b29a06ba7a5f

diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c
index 6ed0802fa8fd86de5be7cc224a2f7192a6a6101a..533e24091e080b3b0f1639d5f044f5eebd70f47d 100644 (file)
--- a/drivers/xen/blktap/blktap.c
+++ b/drivers/xen/blktap/blktap.c
@@ -91,7 +91,7 @@ static int mmap_pages = MMAP_PAGES;
 /*Data struct handed back to userspace for tapdisk device to VBD mapping*/
 typedef struct domid_translate {
        unsigned short domid;
-       u32 busid;
+       unsigned short busid;
 } domid_translate_t ;
 
 /*Data struct associated with each of the tapdisk devices*/
@@ -508,13 +508,6 @@ void signal_tapdisk(int idx)
        tap_blkif_t *info;
        struct task_struct *ptask;
 
-       /*
-        * if the userland tools set things up wrong, this could be negative;
-        * just don't try to signal in this case
-        */
-       if (idx < 0)
-               return;
-
        info = tapfds[idx];
        if ((idx < 0) || (idx > MAX_TAP_DEV) || !info)
                return;