patch revert-linux-2.6.18-xen.hg-598.f1d726b984a3

diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c
index 2b78926a3fa8f887c5c464c2ed0d48548cfe2536..6ed0802fa8fd86de5be7cc224a2f7192a6a6101a 100644 (file)
--- a/drivers/xen/blktap/blktap.c
+++ b/drivers/xen/blktap/blktap.c
@@ -90,14 +90,9 @@ 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;
-       unsigned short busid;
-} domid_translate_t ;
-
-typedef struct domid_translate_ext {
        unsigned short domid;
        u32 busid;
-} domid_translate_ext_t ;
+} domid_translate_t ;
 
 /*Data struct associated with each of the tapdisk devices*/
 typedef struct tap_blkif {
@@ -118,7 +113,7 @@ typedef struct tap_blkif {
        unsigned long *idx_map;       /*Record the user ring id to kern 
                                        [req id, idx] tuple                  */
        blkif_t *blkif;               /*Associate blkif with tapdev          */
-       struct domid_translate_ext trans; /*Translation from domid to bus.   */
+       struct domid_translate trans; /*Translation from domid to bus.       */
 } tap_blkif_t;
 
 static struct tap_blkif *tapfds[MAX_TAP_DEV];
@@ -221,7 +216,6 @@ static int blktap_major;
 #define BLKTAP_IOCTL_MAJOR          7
 #define BLKTAP_QUERY_ALLOC_REQS      8
 #define BLKTAP_IOCTL_FREEINTF        9
-#define BLKTAP_IOCTL_NEWINTF_EXT     50
 #define BLKTAP_IOCTL_PRINT_IDXS      100  
 
 /* blktap switching modes: (Set with BLKTAP_IOCTL_SETMODE)             */
@@ -791,26 +785,6 @@ static int blktap_ioctl(struct inode *inode, struct file *filp,
                info->trans.busid = tr->busid;
                return info->minor;
        }
-       case BLKTAP_IOCTL_NEWINTF_EXT:
-       {
-               void __user *udata = (void __user *) arg;
-               domid_translate_ext_t tr;
-
-               if (copy_from_user(&tr, udata, sizeof(domid_translate_ext_t)))
-                       return -EFAULT;
-
-               DPRINTK("NEWINTF_EXT Req for domid %d and bus id %d\n", 
-                      tr.domid, tr.busid);
-               info = get_next_free_dev();
-               if (!info) {
-                       WPRINTK("Error initialising /dev/xen/blktap - "
-                               "No more devices\n");
-                       return -1;
-               }
-               info->trans.domid = tr.domid;
-               info->trans.busid = tr.busid;
-               return info->minor;
-       }
        case BLKTAP_IOCTL_FREEINTF:
        {
                unsigned long dev = arg;