diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-26 09:34:08 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-26 09:34:08 +0000 |
| commit | f33c74b5eaaded534a3b2270791e12549b9547b0 (patch) | |
| tree | 6ca3e75e854ab9add2f3ebf1c882bddce3b6c400 | |
| parent | 847693067abd74e300e71ad1ba535d470c1b3c64 (diff) | |
| download | xen-f33c74b5eaaded534a3b2270791e12549b9547b0.tar.gz xen-f33c74b5eaaded534a3b2270791e12549b9547b0.tar.bz2 xen-f33c74b5eaaded534a3b2270791e12549b9547b0.zip | |
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
| -rw-r--r-- | tools/blktap/drivers/blk_linux.c | 2 | ||||
| -rw-r--r-- | tools/blktap2/drivers/blk_linux.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap/drivers/blk_linux.c b/tools/blktap/drivers/blk_linux.c index f1b14bd6e8..bb52717050 100644 --- 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 75ddcc389f..85763acada 100644 --- 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" |