Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1725891 > unrolled thread

linux-next: build failure after merge of the nvdimm tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2017-09-04 09:40 +0200
Last post2017-09-04 20:40 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  linux-next: build failure after merge of the nvdimm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-04 09:40 +0200
    Re: linux-next: build failure after merge of the nvdimm tree Dan Williams <dan.j.williams@intel.com> - 2017-09-04 20:40 +0200

#1725891 — linux-next: build failure after merge of the nvdimm tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2017-09-04 09:40 +0200
Subjectlinux-next: build failure after merge of the nvdimm tree
Message-ID<ulU9b-2BO-9@gated-at.bofh.it>
Hi Dan,

After merging the nvdimm tree, today's linux-next build (i386 defconfig)
failed like this:

drivers/dax/super.c:64:20: error: redefinition of 'fs_dax_get_by_bdev'
 struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
                    ^
In file included from drivers/dax/super.c:22:0:
include/linux/dax.h:76:34: note: previous definition of 'fs_dax_get_by_bdev' was here
 static inline struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
                                  ^ 

Caused by commit

  78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")

The protection in drivers/dax/super.c is CONFIG_BLOCK, while in
include/linux/dax.h it is IS_ENABLED(CONFIG_FS_DAX) and the Makefile
uses CONFIG_DAX.

I have reverted that commit and the following 3 for today.

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]


#1726223

FromDan Williams <dan.j.williams@intel.com>
Date2017-09-04 20:40 +0200
Message-ID<um4rU-wL-13@gated-at.bofh.it>
In reply to#1725891
On Mon, Sep 4, 2017 at 12:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dan,
>
> After merging the nvdimm tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> drivers/dax/super.c:64:20: error: redefinition of 'fs_dax_get_by_bdev'
>  struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
>                     ^
> In file included from drivers/dax/super.c:22:0:
> include/linux/dax.h:76:34: note: previous definition of 'fs_dax_get_by_bdev' was here
>  static inline struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
>                                   ^
>
> Caused by commit
>
>   78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")
>
> The protection in drivers/dax/super.c is CONFIG_BLOCK, while in
> include/linux/dax.h it is IS_ENABLED(CONFIG_FS_DAX) and the Makefile
> uses CONFIG_DAX.
>
> I have reverted that commit and the following 3 for today.

Thanks Stephen, I have appended a fix to that branch.

https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git/commit/?h=libnvdimm-for-next&id=26f2f4de0bd93

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web