From: Tommi Rantala <tt.rantala@gmail.com>
To: davej@codemonkey.org.uk
Cc: trinity@vger.kernel.org, Tommi Rantala <tt.rantala@gmail.com>
Subject: [PATCH 5/5] btrfs/ioctl.h is not really needed
Date: Sun, 5 Feb 2017 17:53:52 +0200 [thread overview]
Message-ID: <20170205155352.13191-5-tt.rantala@gmail.com> (raw)
In-Reply-To: <20170205155352.13191-1-tt.rantala@gmail.com>
<linux/btrfs.h> has the ioctl definitions we want, so I see no reason for
checking for <btrfs/ioctl.h>.
---
configure | 1 -
ioctls/btrfs.c | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index dc09317..dff66d3 100755
--- a/configure
+++ b/configure
@@ -255,7 +255,6 @@ check_header linux/if_alg.h USE_IF_ALG
check_header linux/rds.h USE_RDS
check_header linux/vfio.h USE_VFIO
check_header linux/btrfs.h USE_BTRFS
-check_header btrfs/ioctl.h USE_BTRFS_IOCTL
check_header drm/drm.h USE_DRM
check_header drm/exynos_drm.h USE_DRM_EXYNOS
check_header sound/compress_offload.h USE_SNDDRV_COMPRESS_OFFLOAD
diff --git a/ioctls/btrfs.c b/ioctls/btrfs.c
index 374baa6..fd9c4b4 100644
--- a/ioctls/btrfs.c
+++ b/ioctls/btrfs.c
@@ -1,9 +1,8 @@
#include "config.h"
-#ifdef USE_BTRFS_IOCTL
+#ifdef USE_BTRFS
#include <stdio.h>
#include <linux/fs.h>
-
-#include <btrfs/ioctl.h>
+#include <linux/btrfs.h>
#include "ioctls.h"
#include "shm.h"
#include "utils.h"
@@ -122,4 +121,4 @@ static const struct ioctl_group btrfs_grp = {
};
REG_IOCTL_GROUP(btrfs_grp)
-#endif /* USE_BTRFS_IOCTL */
+#endif /* USE_BTRFS */
--
2.9.3
next prev parent reply other threads:[~2017-02-05 15:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-05 15:53 [PATCH 1/5] Makefile: use grep -c to avoid wc -l Tommi Rantala
2017-02-05 15:53 ` [PATCH 2/5] Makefile: use findstring to check if we are building in development mode Tommi Rantala
2017-02-05 15:53 ` [PATCH 3/5] Makefile: improve build time with immediate variables Tommi Rantala
2017-02-05 15:53 ` [PATCH 4/5] Makefile: -Werror also for gcc 6.x Tommi Rantala
2017-02-05 15:53 ` Tommi Rantala [this message]
2017-02-07 10:05 ` [PATCH 1/5] Makefile: use grep -c to avoid wc -l Michael Ellerman
2017-02-07 14:14 ` Dave Jones
2017-02-08 3:52 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170205155352.13191-5-tt.rantala@gmail.com \
--to=tt.rantala@gmail.com \
--cc=davej@codemonkey.org.uk \
--cc=trinity@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).