Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

diff --cc drivers/md/dm-table.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/erofs/super.c
index a8d49e8fc83a3b774f2fcf216893fcbee423cf39,8fc6c04b54f4163832ef491d49c9478a7085715c..2dc0b9f1d42198efeeca37f6f87d70f6bf3dffe7
--- 1/fs/erofs/super.c
--- 2/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@@ -526,6 -482,6 +526,7 @@@ static int erofs_fc_fill_super(struct s
        struct inode *inode;
        struct erofs_sb_info *sbi;
        struct erofs_fs_context *ctx = fc->fs_private;
++      struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
        int err;
  
        sb->s_magic = EROFS_SUPER_MAGIC;
@@@ -540,16 -496,10 +541,17 @@@
                return -ENOMEM;
  
        sb->s_fs_info = sbi;
-       sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
++      sbi->dax_dev = dax_dev;
        err = erofs_read_superblock(sb);
        if (err)
                return err;
  
-           !bdev_dax_supported(sb->s_bdev, EROFS_BLKSIZ)) {
 +      if (test_opt(ctx, DAX_ALWAYS) &&
++          !dax_supported(dax_dev, sb->s_bdev, EROFS_BLKSIZ, 0,
++                         bdev_nr_sectors(sb->s_bdev))) {
 +              errorfc(fc, "DAX unsupported by block device. Turning off DAX.");
 +              clear_opt(ctx, DAX_ALWAYS);
 +      }
        sb->s_flags |= SB_RDONLY | SB_NOATIME;
        sb->s_maxbytes = MAX_LFS_FILESIZE;
        sb->s_time_gran = 1;

diff --cc fs/ext2/super.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/xfs/xfs_super.c
index 9a86d3ec2cb612d1b3dd48bc4a0146bfd28873b4,f4384974e52aed4a38f19244bfaee9d7781b9e81..c4e0cd1c1c8cabba3431b9074ccb67a8a7143972
--- 1/fs/xfs/xfs_super.c
--- 2/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@@ -327,9 -311,18 +327,18 @@@ xfs_set_inode_alloc
                xfs_perag_put(pag);
        }
  
 -      return (mp->m_flags & XFS_MOUNT_32BITINODES) ? maxagi : agcount;
 +      return xfs_is_inode32(mp) ? maxagi : agcount;
  }
  
+ static bool
+ xfs_buftarg_is_dax(
+       struct super_block      *sb,
+       struct xfs_buftarg      *bt)
+ {
+       return dax_supported(bt->bt_daxdev, bt->bt_bdev, sb->s_blocksize, 0,
+                       bdev_nr_sectors(bt->bt_bdev));
+ }
+ 
  STATIC int
  xfs_blkdev_get(
        xfs_mount_t             *mp,