This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] [xen-unstable] tools/blktap, blktap2: include <sys/mount

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools/blktap, blktap2: include <sys/mount.h> instead of <linux/fs.h>
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Mon, 17 Jan 2011 17:05:10 -0800
Delivery-date: Mon, 17 Jan 2011 17:06:20 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1295284460 0
# Node ID 0dbad563a6592addd1d757afa41b3960d0862270
# Parent  f1a5ac39c15e30b1f5be190f27b4cf914b3d9723
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

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
 tools/blktap/drivers/blk_linux.c  |    2 +-
 tools/blktap2/drivers/blk_linux.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r f1a5ac39c15e -r 0dbad563a659 tools/blktap/drivers/blk_linux.c
--- a/tools/blktap/drivers/blk_linux.c  Thu Jan 13 16:00:59 2011 +0000
+++ b/tools/blktap/drivers/blk_linux.c  Mon Jan 17 17:14:20 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 f1a5ac39c15e -r 0dbad563a659 tools/blktap2/drivers/blk_linux.c
--- a/tools/blktap2/drivers/blk_linux.c Thu Jan 13 16:00:59 2011 +0000
+++ b/tools/blktap2/drivers/blk_linux.c Mon Jan 17 17:14:20 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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools/blktap, blktap2: include <sys/mount.h> instead of <linux/fs.h>, Xen patchbot-unstable <=