debuggers.hg

changeset 22811:0dbad563a659
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>
author: Ian Campbell <ian.campbell@citrix.com>
date: Mon Jan 17 17:14:20 2011 +0000 (2011-01-17)
parents: f1a5ac39c15e
children: b7b29f51205f
files: tools/blktap/drivers/blk_linux.c tools/blktap2/drivers/blk_linux.c
     1.1 --- a/tools/blktap/drivers/blk_linux.c	Thu Jan 13 16:00:59 2011 +0000
     1.2 +++ b/tools/blktap/drivers/blk_linux.c	Mon Jan 17 17:14:20 2011 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  #include <inttypes.h>
     1.5  #include <sys/ioctl.h>
     1.6 -#include <linux/fs.h>
     1.7 +#include <sys/mount.h>
     1.8  #include "tapdisk.h"
     1.9  #include "blk.h"
    1.10  

     2.1 --- a/tools/blktap2/drivers/blk_linux.c	Thu Jan 13 16:00:59 2011 +0000
     2.2 +++ b/tools/blktap2/drivers/blk_linux.c	Mon Jan 17 17:14:20 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #include <inttypes.h>
     2.5 +#include <errno.h>
     2.6  #include <sys/ioctl.h>
     2.7 -#include <linux/fs.h>
     2.8 -#include <linux/errno.h>
     2.9 +#include <sys/mount.h>
    2.10  #include "tapdisk.h"
    2.11  #include "blk.h"
    2.12
author	Ian Campbell <ian.campbell@citrix.com>
date	Mon Jan 17 17:14:20 2011 +0000 (2011-01-17)
parents	f1a5ac39c15e
children	b7b29f51205f
files	tools/blktap/drivers/blk_linux.c tools/blktap2/drivers/blk_linux.c