diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-24 18:12:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-24 18:12:09 -0700 |
commit | f0614eefbf829a2914ac9a82cb8bbeaf1af28f9d (patch) | |
tree | d295287fe55ce674936ab529f6e3e05e27e5e1ea | |
parent | b9132c32e01976686efa26252cc246944a0d2cab (diff) | |
parent | db8cd5efeebc4904df1653926102413d088a5c7e (diff) |
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
-rw-r--r-- | drivers/dax/super.c | 2 | ||||
-rw-r--r-- | fs/dax.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index aedc15eabeac..0211e6f7b47a 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -21,6 +21,7 @@ * @cdev: optional character interface for "device dax" * @private: dax driver private data * @flags: state and boolean properties + * @ops: operations for this device */ struct dax_device { struct inode inode; @@ -476,6 +477,7 @@ static int dax_fs_init(void) static void dax_fs_exit(void) { kern_unmount(dax_mnt); + rcu_barrier(); kmem_cache_destroy(dax_cache); } @@ -389,7 +389,7 @@ static struct page *dax_busy_page(void *entry) } /* - * dax_lock_mapping_entry - Lock the DAX entry corresponding to a page + * dax_lock_page - Lock the DAX entry corresponding to a page * @page: The page whose entry we want to lock * * Context: Process context. |