linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Re: dkms build error
@ 2010-06-13  3:51 Jim Ursetto
  0 siblings, 0 replies; 2+ messages in thread
From: Jim Ursetto @ 2010-06-13  3:51 UTC (permalink / raw)
  To: linux-btrfs

[-- 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,


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* dkms build error
@ 2010-05-31  7:20 Andreas Philipp
  0 siblings, 0 replies; 2+ messages in thread
From: Andreas Philipp @ 2010-05-31  7:20 UTC (permalink / raw)
  To: linux-btrfs

Hi,

Unfortunately, I did not succeed to compile a btrfs module via dkms fro=
m
btrfs-unstable (commit 9aeead73782c4b8e2a91def36dbf95db28605c95) for ke=
rnel
version 2.6.34-git16. For the exact error message, please see the make.=
log
attached. If I replace the symlink to btrfs-unstable/fs/btrfs by a suml=
ink
to the corresponding subdirectory of the kernel tree everything works w=
ell.

Thanks,
Andreas Philipp

aph@thor ~ $ cat /var/lib/dkms/btrfs/git/build/make.log
DKMS make.log for btrfs-git for kernel 2.6.34-git16 (x86_64)
Sun May 30 20:37:43 CEST 2010
make: Entering directory `/usr/src/linux-2.6.34-git16'
  LD      /var/lib/dkms/btrfs/git/build/built-in.o
  CC [M]  /var/lib/dkms/btrfs/git/build/super.o
/var/lib/dkms/btrfs/git/build/super.c: In function =91btrfs_fill_super=92=
:
/var/lib/dkms/btrfs/git/build/super.c:446: warning: assignment from inc=
ompatible pointer type
  CC [M]  /var/lib/dkms/btrfs/git/build/ctree.o
  CC [M]  /var/lib/dkms/btrfs/git/build/extent-tree.o
/var/lib/dkms/btrfs/git/build/extent-tree.c: In function =91btrfs_issue=
_discard=92:
/var/lib/dkms/btrfs/git/build/extent-tree.c:1699: error: =91DISCARD_FL_=
BARRIER=92 undeclared (first use in this function)
/var/lib/dkms/btrfs/git/build/extent-tree.c:1699: error: (Each undeclar=
ed identifier is reported only once
/var/lib/dkms/btrfs/git/build/extent-tree.c:1699: error: for each funct=
ion it appears in.)
make[1]: *** [/var/lib/dkms/btrfs/git/build/extent-tree.o] Error 1
make: *** [_module_/var/lib/dkms/btrfs/git/build] Error 2
make: Leaving directory `/usr/src/linux-2.6.34-git16'


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" =
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-06-13  3:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-13  3:51 dkms build error Jim Ursetto
  -- strict thread matches above, loose matches on Subject: below --
2010-05-31  7:20 Andreas Philipp

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).