Ian Campbell
2011-Jan-12 09:49 UTC
[Xen-devel] [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
# 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. 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" _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Campbell
2011-Jan-12 09:55 UTC
[Xen-devel] Re: [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
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@zakaz.uk.xensource.com> Ian. On Wed, 2011-01-12 at 09:49 +0000, 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. > > 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" >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Jan-12 17:18 UTC
[Xen-devel] Re: [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
Ian Campbell writes ("[Xen-devel] Re: [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>"):> 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@zakaz.uk.xensource.com>Thanks, and sorry to miss it the first time round. I''ll apply it after 4.1.0 rc1. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Daniel Stodden
2011-Jan-12 22:06 UTC
Re: [Xen-devel] [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
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"_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Campbell
2011-Jan-12 22:12 UTC
Re: [Xen-devel] [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
On Wed, 2011-01-12 at 22:06 +0000, Daniel Stodden wrote:> 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.]Bare WRITE (and READ) seem to be used in e.g. tools/blktap/drivers/blktapctrl.c and tools/blktap/drivers/tapdisk.c in xen-unstable.hg. blktap2 looks clean apart from the header though. I think using sys/mount.h is correct in its own right but it would probably also be correct to switch to the properly namespaced variants. Ian.> > 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" > > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Jan-17 17:14 UTC
Re: [Xen-devel] [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>
Ian Campbell writes ("[Xen-devel] [PATCH] blktap[12]: include <sys/mount.h> instead of <linux/fs.h>"):> 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@citrix.com>Applied, thanks. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel