Commit f0614eef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/dax/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -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.