[Xen-devel] Re: [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>

[Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>]

This is a repost of a patch from the thread "Xen 4.0.1 failed to compile
on Ubuntu Natty 32 bits". Specifically
<1292492084.32368.6927.camel@xxxxxxxxxxxxxxxxxxxxxx>

Ian.

On Wed, 2011-01-12 at 09:49 +0000, Ian Campbell wrote:
> # HG changeset patch
> # User Ian Campbell <ian.campbell@xxxxxxxxxx>
> # 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.
> 
> Also there is no reason to use <linux/errno.h> over the more normal
> <errno.h>.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> 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"
>  



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