From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Stodden <daniel.stodden@citrix.com>
Subject: Re: [PATCH] blktap[12]: include <sys/mount.h> instead
	of <linux/fs.h>
Date: Wed, 12 Jan 2011 14:06:08 -0800
Message-ID: <1294869968.7920.10085.camel@agari.van.xensource.com>
References: <a5a02c0baa75b66c71f2.1294825785@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <a5a02c0baa75b66c71f2.1294825785@localhost.localdomain>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian, Campbell <Ian.Campbell@eu.citrix.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2011-01-12 at 04:49 -0500, Ian Campbell wrote:
> # HG changeset patch
> # User Ian Campbell <ian.campbell@citrix.com>
> # Date 1294825752 0
> # Node ID a5a02c0baa75b66c71f2828d22971f9dfb1e8a6b
> # Parent  610c0b9e9e3d70275a37aba9857e1b9d3a361bd0
> blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
> 
> The former is a userspace sanitised header which contains the
> definitions we need. In some distros linux/fs.h defines WRITE which
> conflicts with blktaps own use of that name.

Ack.

[But fwiw we have BLKIF_OP_WRITE and TD_OP_WRITE and all proper code
should carry a TD_, so I'm slightly surprised.]

Daniel

> Also there is no reason to use <linux/errno.h> over the more normal
> <errno.h>.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> diff -r 610c0b9e9e3d -r a5a02c0baa75 tools/blktap/drivers/blk_linux.c
> --- a/tools/blktap/drivers/blk_linux.c	Wed Jan 12 09:49:00 2011 +0000
> +++ b/tools/blktap/drivers/blk_linux.c	Wed Jan 12 09:49:12 2011 +0000
> @@ -1,6 +1,6 @@
>  #include <inttypes.h>
>  #include <sys/ioctl.h>
> -#include <linux/fs.h>
> +#include <sys/mount.h>
>  #include "tapdisk.h"
>  #include "blk.h"
>  
> diff -r 610c0b9e9e3d -r a5a02c0baa75 tools/blktap2/drivers/blk_linux.c
> --- a/tools/blktap2/drivers/blk_linux.c	Wed Jan 12 09:49:00 2011 +0000
> +++ b/tools/blktap2/drivers/blk_linux.c	Wed Jan 12 09:49:12 2011 +0000
> @@ -1,7 +1,7 @@
>  #include <inttypes.h>
> +#include <errno.h>
>  #include <sys/ioctl.h>
> -#include <linux/fs.h>
> -#include <linux/errno.h>
> +#include <sys/mount.h>
>  #include "tapdisk.h"
>  #include "blk.h"