Commit f0614eef authored by Linus Torvalds's avatar Linus Torvalds

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
parents b9132c32 db8cd5ef
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* @cdev: optional character interface for "device dax" * @cdev: optional character interface for "device dax"
* @private: dax driver private data * @private: dax driver private data
* @flags: state and boolean properties * @flags: state and boolean properties
* @ops: operations for this device
*/ */
struct dax_device { struct dax_device {
struct inode inode; struct inode inode;
...@@ -476,6 +477,7 @@ static int dax_fs_init(void) ...@@ -476,6 +477,7 @@ static int dax_fs_init(void)
static void dax_fs_exit(void) static void dax_fs_exit(void)
{ {
kern_unmount(dax_mnt); kern_unmount(dax_mnt);
rcu_barrier();
kmem_cache_destroy(dax_cache); kmem_cache_destroy(dax_cache);
} }
......
...@@ -389,7 +389,7 @@ static struct page *dax_busy_page(void *entry) ...@@ -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 * @page: The page whose entry we want to lock
* *
* Context: Process context. * Context: Process context.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment