Attachment 312453 Details for Bug 442723 – Expand blktap to understand the new IOCTL and handle new and old userland

[patch] Expand blktap to understand the new IOCTL and handle new and old userland

linux-2.6.18-expand-xvd-blktap.patch (text/plain), 2.14 KB, created by Chris Lalancette on 2008-07-23 10:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2008-07-23 10:07:54 UTC

Size: 2.14 KB

patch

obsolete

>diff -urp linux-2.6.18.noarch.patch2/drivers/xen/blktap/blktapmain.c linux-2.6.18.noarch/drivers/xen/blktap/blktapmain.c
>--- linux-2.6.18.noarch.patch2/drivers/xen/blktap/blktapmain.c	2008-07-11 16:20:47.000000000 +0200
>+++ linux-2.6.18.noarch/drivers/xen/blktap/blktapmain.c	2008-07-11 16:50:34.000000000 +0200
>@@ -132,7 +132,12 @@ typedef struct domid_translate {
> 	unsigned short busid;
> } domid_translate_t ;
> 
>-static domid_translate_t  translate_domid[MAX_TAP_DEV];
>+typedef struct domid_translate_ext {
>+	unsigned short domid;
>+	u32 busid;
>+} domid_translate_ext_t ;
>+
>+static domid_translate_ext_t  translate_domid[MAX_TAP_DEV];
> static tap_blkif_t *tapfds[MAX_TAP_DEV];
> 
> static int __init set_blkif_reqs(char *str)
>@@ -238,6 +243,7 @@ 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)             */
>@@ -395,6 +401,13 @@ 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->pid > 0) ) {
> 		ptask = find_task_by_pid(info->pid);
>@@ -635,6 +648,27 @@ static int blktap_ioctl(struct inode *in
> 		translate_domid[newdev].busid = tr->busid;
> 		return newdev;
> 	}
>+	case BLKTAP_IOCTL_NEWINTF_EXT:
>+	{
>+		void __user *udata = (void __user *) arg;
>+		domid_translate_ext_t tr;
>+		int newdev;
>+
>+		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);
>+		newdev = get_next_free_dev();
>+		if (newdev < 1) {
>+			WPRINTK("Error initialising /dev/xen/blktap - "
>+				"No more devices\n");
>+			return -1;
>+		}
>+		translate_domid[newdev].domid = tr.domid;
>+		translate_domid[newdev].busid = tr.busid;
>+		return newdev;
>+	}
> 	case BLKTAP_IOCTL_FREEINTF:
> 	{
> 		unsigned long dev = arg;

Actions: View | Diff

Attachments on bug 442723: 312451 | 312452 | 312453