NotificationsYou must be signed in to change notification settings
Fork0
Star2

Commita311283

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 parentsba4f184 +88b67ed commita311283Copy full SHA for a311283

File tree

1 file changed

-9

lines changed

include/linux
- dax.h

1 file changed

-9

lines changed

`‎include/linux/dax.h‎`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ static inline void set_dax_synchronous(struct dax_device *dax_dev)`
`58`	`58`	`{`
`59`	`59`	`__set_dax_synchronous(dax_dev);`
`60`	`60`	`}`
	`61`	`+booldax_supported(structdax_devicedax_dev,structblock_devicebdev,`
	`62`	`+intblocksize,sector_tstart,sector_tlen);`
`61`	`63`	`/*`
`62`	`64`	`* Check if given mapping is supported by the file / underlying device.`
`63`	`65`	`*/`
`@@ -104,6 +106,12 @@ static inline bool dax_synchronous(struct dax_device *dax_dev)`
`104`	`106`	`staticinlinevoidset_dax_synchronous(structdax_device*dax_dev)`
`105`	`107`	`{`
`106`	`108`	`}`
	`109`	`+staticinlinebooldax_supported(structdax_device*dax_dev,`
	`110`	`+structblock_device*bdev,intblocksize,sector_tstart,`
	`111`	`+sector_tlen)`
	`112`	`+{`
	`113`	`+return false;`
	`114`	`+}`
`107`	`115`	`staticinlinebooldaxdev_mapping_supported(structvm_area_struct*vma,`
`108`	`116`	`structdax_device*dax_dev)`
`109`	`117`	`{`
`@@ -130,8 +138,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,`
`130`	`138`	`return__generic_fsdax_supported(dax_dev,bdev,blocksize,start,`
`131`	`139`	`sectors);`
`132`	`140`	`}`
`133`		`-booldax_supported(structdax_devicedax_dev,structblock_devicebdev,`
`134`		`-intblocksize,sector_tstart,sector_tlen);`
`135`	`141`
`136`	`142`	`staticinlinevoidfs_put_dax(structdax_device*dax_dev)`
`137`	`143`	`{`
`@@ -159,13 +165,6 @@ static inline bool generic_fsdax_supported(struct dax_device *dax_dev,`
`159`	`165`	`return false;`
`160`	`166`	`}`
`161`	`167`
`162`		`-staticinlinebooldax_supported(structdax_device*dax_dev,`
`163`		`-structblock_device*bdev,intblocksize,sector_tstart,`
`164`		`-sector_tlen)`
`165`		`-{`
`166`		`-return false;`
`167`		`-}`
`168`		`-`
`169`	`168`	`staticinlinevoidfs_put_dax(structdax_device*dax_dev)`
`170`	`169`	`{`
`171`	`170`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita311283

File tree

1 file changed

1 file changed

`‎include/linux/dax.h‎`

0 commit comments