projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
[linux-2.6-microblaze.git]
/
fs
/
xfs
/
xfs_super.c
diff --git
a/fs/xfs/xfs_super.c
b/fs/xfs/xfs_super.c
index
9a86d3e
..
c4e0cd1
100644
(file)
--- a/
fs/xfs/xfs_super.c
+++ b/
fs/xfs/xfs_super.c
@@
-330,6
+330,15
@@
xfs_set_inode_alloc(
return xfs_is_inode32(mp) ? 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,
STATIC int
xfs_blkdev_get(
xfs_mount_t *mp,
@@
-1588,11
+1597,10
@@
xfs_fs_fill_super(
xfs_warn(mp,
"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
xfs_warn(mp,
"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
- datadev_is_dax = bdev_dax_supported(mp->m_ddev_targp->bt_bdev,
- sb->s_blocksize);
+ datadev_is_dax = xfs_buftarg_is_dax(sb, mp->m_ddev_targp);
if (mp->m_rtdev_targp)
if (mp->m_rtdev_targp)
- rtdev_is_dax =
bdev_dax_supported(
-
mp->m_rtdev_targp->bt_bdev, sb->s_blocksize
);
+ rtdev_is_dax =
xfs_buftarg_is_dax(sb,
+
mp->m_rtdev_targp
);
if (!rtdev_is_dax && !datadev_is_dax) {
xfs_alert(mp,
"DAX unsupported by block device. Turning off DAX.");
if (!rtdev_is_dax && !datadev_is_dax) {
xfs_alert(mp,
"DAX unsupported by block device. Turning off DAX.");