Skip to content

Commit f0614ee

Browse files
committed
Merge tag 'dax-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull DAX updates from Dan Williams: "Andrew has been shepherding major dax features that touch the core -mm through his tree, but I still collect the dax updates that are core-mm independent. - Fix a crash due to a missing rcu_barrier() in dax_fs_exit() - Fix two miscellaneous doc issues" * tag 'dax-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: Fix missing kdoc for dax_device dax: make sure inodes are flushed before destroy cache fsdax: fix function description
2 parents b9132c3 + db8cd5e commit f0614ee

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/dax/super.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @cdev: optional character interface for "device dax"
2222
* @private: dax driver private data
2323
* @flags: state and boolean properties
24+
* @ops: operations for this device
2425
*/
2526
struct dax_device {
2627
struct inode inode;
@@ -476,6 +477,7 @@ static int dax_fs_init(void)
476477
static void dax_fs_exit(void)
477478
{
478479
kern_unmount(dax_mnt);
480+
rcu_barrier();
479481
kmem_cache_destroy(dax_cache);
480482
}
481483

fs/dax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ static struct page *dax_busy_page(void *entry)
389389
}
390390

391391
/*
392-
* dax_lock_mapping_entry - Lock the DAX entry corresponding to a page
392+
* dax_lock_page - Lock the DAX entry corresponding to a page
393393
* @page: The page whose entry we want to lock
394394
*
395395
* Context: Process context.

0 commit comments

Comments
 (0)