p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block, dax: convert bdev_dax_supported() to dax_direct_access() 

Kill of the final user of bdev_direct_access() and struct blk_dax_ctl.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2017-04-01 16:02:38 -07:00
parent cccbce6715
commit 2093f2e9df
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fs/block_dev.c
View File

@ -788,35 +788,43 @@ EXPORT_SYMBOL(bdev_dax_pgoff);
*/ */
int bdev_dax_supported(struct super_block *sb, int blocksize) int bdev_dax_supported(struct super_block *sb, int blocksize)
{ {
struct blk_dax_ctl dax = { struct block_device *bdev = sb->s_bdev;
.sector = 0, struct dax_device *dax_dev;
.size = PAGE_SIZE, pgoff_t pgoff;
}; int err, id;
int err; void *kaddr;
pfn_t pfn;
long len;
if (blocksize != PAGE_SIZE) { if (blocksize != PAGE_SIZE) {
vfs_msg(sb, KERN_ERR, "error: unsupported blocksize for dax"); vfs_msg(sb, KERN_ERR, "error: unsupported blocksize for dax");
return -EINVAL; return -EINVAL;
} }
err = bdev_direct_access(sb->s_bdev, &dax); err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);
if (err < 0) { if (err) {
switch (err) { vfs_msg(sb, KERN_ERR, "error: unaligned partition for dax");
case -EOPNOTSUPP:
vfs_msg(sb, KERN_ERR,
"error: device does not support dax");
break;
case -EINVAL:
vfs_msg(sb, KERN_ERR,
"error: unaligned partition for dax");
break;
default:
vfs_msg(sb, KERN_ERR,
"error: dax access failed (%d)", err);
}
return err; return err;
} }
dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);
if (!dax_dev) {
vfs_msg(sb, KERN_ERR, "error: device does not support dax");
return -EOPNOTSUPP;
}
id = dax_read_lock();
len = dax_direct_access(dax_dev, pgoff, 1, &kaddr, &pfn);
dax_read_unlock(id);
put_dax(dax_dev);
if (len < 1) {
vfs_msg(sb, KERN_ERR,
"error: dax access failed (%d)", len);
return len < 0 ? len : -EIO;
}
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(bdev_dax_supported); EXPORT_SYMBOL_GPL(bdev_dax_supported);