From: Eric Sandeen <sandeen@redhat.com>
To: dsterba@suse.cz, Qu Wenruo <quwenruo@cn.fujitsu.com>,
Qu Wenruo <quwenruo.btrfs@gmx.com>,
Abhay Sachan <lkp.abhay@gmail.com>,
linux-btrfs@vger.kernel.org
Subject: [PATCH] btrfs-progs: define FIEMAP_EXTENT_SHARED locally if needed
Date: Fri, 14 Oct 2016 12:03:48 -0500 [thread overview]
Message-ID: <c9a18735-4127-2ab4-e93e-a32c50c49392@redhat.com> (raw)
In-Reply-To: <3caf7539-5eae-d085-1fc6-b48ce0ae99a2@redhat.com>
As it stands today, btrfs-progs won't build if the installed
kernel headers don't define FIEMAP_EXTENT_SHARED.
But that doesn't tell us anything about the capabilities of
the /running/ kernel - so just define it locally if not found
in the fiemap header, and allow the build to proceed.
If run against an old kernel, worst case scenario is that
no shared extents will be reported via the du command.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
you can take it or leave it, but I had this locally
anyway, so if it's helpful here you go :)
diff --git a/cmds-fi-du.c b/cmds-fi-du.c
index a5b66e6..fa8f421 100644
--- a/cmds-fi-du.c
+++ b/cmds-fi-du.c
@@ -29,6 +29,11 @@
#include <linux/fs.h>
#include <linux/fiemap.h>
+/* Appeared upstream in 2.6.33 */
+#ifndef FIEMAP_EXTENT_SHARED
+#define FIEMAP_EXTENT_SHARED 0x00002000
+#endif
+
#include "utils.h"
#include "commands.h"
#include "kerncompat.h"
diff --git a/configure.ac b/configure.ac
index 8fd8f42..9b87b24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,8 +144,6 @@ if test "$DISABLE_BTRFSCONVERT" = 0 && test "x$convertfs" = "x"; then
AC_MSG_ERROR([no filesystems for convert, use --disable-convert instead])
fi
-AX_CHECK_DEFINE([linux/fiemap.h], [FIEMAP_EXTENT_SHARED], [],
- [AC_MSG_ERROR([no definition of FIEMAP_EXTENT_SHARED found])])
dnl Define <NAME>_LIBS= and <NAME>_CFLAGS= by pkg-config
dnl
next prev parent reply other threads:[~2016-10-14 17:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-12 13:58 Btrfs progs build fails for 4.8 Abhay Sachan
2016-10-12 14:01 ` Qu Wenruo
2016-10-12 14:45 ` Abhay Sachan
2016-10-12 14:54 ` Eric Sandeen
2016-10-12 17:26 ` David Sterba
2016-10-13 7:25 ` Qu Wenruo
2016-10-14 15:49 ` David Sterba
2016-10-14 17:00 ` Eric Sandeen
2016-10-14 17:03 ` Eric Sandeen [this message]
2016-10-14 17:08 ` David Sterba
2016-10-14 16:54 ` David Sterba
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=c9a18735-4127-2ab4-e93e-a32c50c49392@redhat.com \
--to=sandeen@redhat.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=lkp.abhay@gmail.com \
--cc=quwenruo.btrfs@gmx.com \
--cc=quwenruo@cn.fujitsu.com \
/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).