From: Jim Ursetto <jim@3e8.org>
To: linux-btrfs@vger.kernel.org
Subject: Re: dkms build error
Date: Sat, 12 Jun 2010 22:51:47 -0500 [thread overview]
Message-ID: <20100613035147.GC16863@3e8.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
On Mon, 31 May 2010 09:20:22 +0200 Andreas Philipp wrote:
> I did not succeed to compile a btrfs module via dkms from btrfs-unstable...
> For the exact error message, please see the make.log...
> /var/lib/dkms/btrfs/git/build/extent-tree.c:1699: error:
> ‘DISCARD_FL_BARRIER’ undeclared (first use in this function)
The problem is the blkdev flag name change that occurred in this commit from
Linus' tree around 2.6.35:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=fbd9b09a177a481eda256447c881f014f29034fe
which is not in btrfs-unstable. That patch doesn't apply cleanly to the
btrfs-unstable tree so attached is one that just modifies extent-tree.c.
Jim
[-- Attachment #2: btrfs-extent-tree.diff.txt --]
[-- Type: text/plain, Size: 470 bytes --]
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b34d32f..c6a4f45 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1589,7 +1589,7 @@ static void btrfs_issue_discard(struct block_device *bdev,
u64 start, u64 len)
{
blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
- DISCARD_FL_BARRIER);
+ BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
}
static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
next reply other threads:[~2010-06-13 3:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-13 3:51 Jim Ursetto [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-31 7:20 dkms build error Andreas Philipp
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=20100613035147.GC16863@3e8.org \
--to=jim@3e8.org \
--cc=linux-btrfs@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).