Mailing List Archive

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1301132048 0
# Node ID c3bb17be91d7392c3608adafd316313578a98a02
# Parent 9ccb0887e84dacb425c0bab3330e3a23fb370752
tools/blktap, blktap2: 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>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 22765:0dbad563a659
xen-unstable date: Mon Jan 17 17:14:20 2011 +0000
---


diff -r 9ccb0887e84d -r c3bb17be91d7 tools/blktap/drivers/blk_linux.c
--- a/tools/blktap/drivers/blk_linux.c Fri Mar 25 09:05:49 2011 +0000
+++ b/tools/blktap/drivers/blk_linux.c Sat Mar 26 09:34:08 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 9ccb0887e84d -r c3bb17be91d7 tools/blktap2/drivers/blk_linux.c
--- a/tools/blktap2/drivers/blk_linux.c Fri Mar 25 09:05:49 2011 +0000
+++ b/tools/blktap2/drivers/blk_linux.c Sat Mar 26 09:34:08 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-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog