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 --git a/tools/blktap/drivers/blk_linux.c b/tools/blktap/drivers/blk_linux.c
index f1b14bd6e886ac518d1b5dd2aece1a26543a3e1a..bb5271705053df4726d523b44c924da9501c3c95 100644 (file)
--- a/tools/blktap/drivers/blk_linux.c
+++ b/tools/blktap/drivers/blk_linux.c
@@ -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 --git a/tools/blktap2/drivers/blk_linux.c b/tools/blktap2/drivers/blk_linux.c
index 75ddcc389f880cd8f632049829a16451a0c4c4e2..85763acada25d78d7ebdfb4ef6fdd865d716ff53 100644 (file)
--- a/tools/blktap2/drivers/blk_linux.c
+++ b/tools/blktap2/drivers/blk_linux.c
@@ -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"