Skip to content

Commit a311283

Browse files
committed
Merge tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Dan Williams: "Fix compilation for the new dax_supported() exported helper" * tag 'libnvdimm-fixes-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX
2 parents ba4f184 + 88b67ed commit a311283

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

include/linux/dax.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ static inline void set_dax_synchronous(struct dax_device *dax_dev)
5858
{
5959
__set_dax_synchronous(dax_dev);
6060
}
61+
bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
62+
int blocksize, sector_t start, sector_t len);
6163
/*
6264
* Check if given mapping is supported by the file / underlying device.
6365
*/
@@ -104,6 +106,12 @@ static inline bool dax_synchronous(struct dax_device *dax_dev)
104106
static inline void set_dax_synchronous(struct dax_device *dax_dev)
105107
{
106108
}
109+
static inline bool dax_supported(struct dax_device *dax_dev,
110+
struct block_device *bdev, int blocksize, sector_t start,
111+
sector_t len)
112+
{
113+
return false;
114+
}
107115
static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
108116
struct dax_device *dax_dev)
109117
{
@@ -130,8 +138,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
130138
return __generic_fsdax_supported(dax_dev, bdev, blocksize, start,
131139
sectors);
132140
}
133-
bool dax_supported(struct dax_device *dax_dev, struct block_device *bdev,
134-
int blocksize, sector_t start, sector_t len);
135141

136142
static inline void fs_put_dax(struct dax_device *dax_dev)
137143
{
@@ -159,13 +165,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,
159165
return false;
160166
}
161167

162-
static inline bool dax_supported(struct dax_device *dax_dev,
163-
struct block_device *bdev, int blocksize, sector_t start,
164-
sector_t len)
165-
{
166-
return false;
167-
}
168-
169168
static inline void fs_put_dax(struct dax_device *dax_dev)
170169
{
171170
}

0 commit comments

Comments
 (0)