* [PATCH] dax: fix FS_DAX=n BLOCK=y compilation
@ 2017-09-03 17:25 Dan Williams
2017-09-04 10:26 ` Jan Kara
0 siblings, 1 reply; 4+ messages in thread
From: Dan Williams @ 2017-09-03 17:25 UTC (permalink / raw)
To: linux-nvdimm
Cc: linux-fsdevel, kbuild test robot, Jan Kara, Christoph Hellwig,
Darrick J. Wong
The 0day kbuild robot reports:
>> 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)
^~~~~~~~~~~~~~~~~~
Protect the definition of fs_dax_get_by_bdev() in drivers/dax/super.c
with an ifdef.
Fixes: 78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")
Cc: Jan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
drivers/dax/super.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index b699aac268a6..3600ff786646 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -61,6 +61,7 @@ int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size,
}
EXPORT_SYMBOL(bdev_dax_pgoff);
+#if IS_ENABLED(CONFIG_FS_DAX)
struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
{
if (!blk_queue_dax(bdev->bd_queue))
@@ -68,6 +69,7 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
return fs_dax_get_by_host(bdev->bd_disk->disk_name);
}
EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);
+#endif
/**
* __bdev_dax_supported() - Check if the device supports dax for filesystem
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] dax: fix FS_DAX=n BLOCK=y compilation
2017-09-03 17:25 [PATCH] dax: fix FS_DAX=n BLOCK=y compilation Dan Williams
@ 2017-09-04 10:26 ` Jan Kara
2017-09-04 15:55 ` Dan Williams
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kara @ 2017-09-04 10:26 UTC (permalink / raw)
To: Dan Williams
Cc: linux-nvdimm, linux-fsdevel, kbuild test robot, Jan Kara,
Christoph Hellwig, Darrick J. Wong
On Sun 03-09-17 10:25:55, Dan Williams wrote:
> The 0day kbuild robot reports:
>
> >> 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)
> ^~~~~~~~~~~~~~~~~~
>
> Protect the definition of fs_dax_get_by_bdev() in drivers/dax/super.c
> with an ifdef.
>
> Fixes: 78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")
> Cc: Jan Kara <jack@suse.cz>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Darrick J. Wong <darrick.wong@oracle.com>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
OK, or you could have both !DAX and DAX implementations in
include/linux/dax.h as inline together? It would look a bit more logical to
me. But I don't care much. So
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> drivers/dax/super.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/dax/super.c b/drivers/dax/super.c
> index b699aac268a6..3600ff786646 100644
> --- a/drivers/dax/super.c
> +++ b/drivers/dax/super.c
> @@ -61,6 +61,7 @@ int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size,
> }
> EXPORT_SYMBOL(bdev_dax_pgoff);
>
> +#if IS_ENABLED(CONFIG_FS_DAX)
> struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
> {
> if (!blk_queue_dax(bdev->bd_queue))
> @@ -68,6 +69,7 @@ struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
> return fs_dax_get_by_host(bdev->bd_disk->disk_name);
> }
> EXPORT_SYMBOL_GPL(fs_dax_get_by_bdev);
> +#endif
>
> /**
> * __bdev_dax_supported() - Check if the device supports dax for filesystem
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] dax: fix FS_DAX=n BLOCK=y compilation
2017-09-04 10:26 ` Jan Kara
@ 2017-09-04 15:55 ` Dan Williams
2017-09-04 16:03 ` Jan Kara
0 siblings, 1 reply; 4+ messages in thread
From: Dan Williams @ 2017-09-04 15:55 UTC (permalink / raw)
To: Jan Kara
Cc: linux-nvdimm@lists.01.org, linux-fsdevel, kbuild test robot,
Christoph Hellwig, Darrick J. Wong
On Mon, Sep 4, 2017 at 3:26 AM, Jan Kara <jack@suse.cz> wrote:
> On Sun 03-09-17 10:25:55, Dan Williams wrote:
>> The 0day kbuild robot reports:
>>
>> >> 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)
>> ^~~~~~~~~~~~~~~~~~
>>
>> Protect the definition of fs_dax_get_by_bdev() in drivers/dax/super.c
>> with an ifdef.
>>
>> Fixes: 78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")
>> Cc: Jan Kara <jack@suse.cz>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: Darrick J. Wong <darrick.wong@oracle.com>
>> Reported-by: kbuild test robot <fengguang.wu@intel.com>
>> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
>
> OK, or you could have both !DAX and DAX implementations in
> include/linux/dax.h as inline together? It would look a bit more logical to
> me. But I don't care much. So
>
> Reviewed-by: Jan Kara <jack@suse.cz>
My motivation for not doing that is to avoid including blkdev.h from dax.h.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] dax: fix FS_DAX=n BLOCK=y compilation
2017-09-04 15:55 ` Dan Williams
@ 2017-09-04 16:03 ` Jan Kara
0 siblings, 0 replies; 4+ messages in thread
From: Jan Kara @ 2017-09-04 16:03 UTC (permalink / raw)
To: Dan Williams
Cc: Jan Kara, linux-nvdimm@lists.01.org, linux-fsdevel,
kbuild test robot, Christoph Hellwig, Darrick J. Wong
On Mon 04-09-17 08:55:33, Dan Williams wrote:
> On Mon, Sep 4, 2017 at 3:26 AM, Jan Kara <jack@suse.cz> wrote:
> > On Sun 03-09-17 10:25:55, Dan Williams wrote:
> >> The 0day kbuild robot reports:
> >>
> >> >> 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)
> >> ^~~~~~~~~~~~~~~~~~
> >>
> >> Protect the definition of fs_dax_get_by_bdev() in drivers/dax/super.c
> >> with an ifdef.
> >>
> >> Fixes: 78f354735081 ("dax: introduce a fs_dax_get_by_bdev() helper")
> >> Cc: Jan Kara <jack@suse.cz>
> >> Cc: Christoph Hellwig <hch@lst.de>
> >> Cc: Darrick J. Wong <darrick.wong@oracle.com>
> >> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> >> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> >
> > OK, or you could have both !DAX and DAX implementations in
> > include/linux/dax.h as inline together? It would look a bit more logical to
> > me. But I don't care much. So
> >
> > Reviewed-by: Jan Kara <jack@suse.cz>
>
> My motivation for not doing that is to avoid including blkdev.h from dax.h.
OK, makes sense.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-04 16:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-03 17:25 [PATCH] dax: fix FS_DAX=n BLOCK=y compilation Dan Williams
2017-09-04 10:26 ` Jan Kara
2017-09-04 15:55 ` Dan Williams
2017-09-04 16:03 ` Jan Kara
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).