diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-11-15 16:56:11 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-15 16:56:11 -0800 |
| commit | 4247f24c23589bcc3bc3490515ef8c9497e9ae55 (patch) | |
| tree | 89726a0e171c443a3e8def2992b56dbd8a21df21 /drivers/dax | |
| parent | 79ab67ede21f536851a99ea68ee6fc1f5435e055 (diff) | |
| parent | 9f586fff6574f6ecbf323f92d44ffaf0d96225fe (diff) | |
| download | linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.tar.bz2 | |
Merge branch 'for-4.15/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 30d8a5aedd23..3ec804672601 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -92,21 +92,21 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) long len; if (blocksize != PAGE_SIZE) { - pr_err("VFS (%s): error: unsupported blocksize for dax\n", + pr_debug("VFS (%s): error: unsupported blocksize for dax\n", sb->s_id); return -EINVAL; } err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff); if (err) { - pr_err("VFS (%s): error: unaligned partition for dax\n", + pr_debug("VFS (%s): error: unaligned partition for dax\n", sb->s_id); return err; } dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); if (!dax_dev) { - pr_err("VFS (%s): error: device does not support dax\n", + pr_debug("VFS (%s): error: device does not support dax\n", sb->s_id); return -EOPNOTSUPP; } @@ -118,7 +118,7 @@ int __bdev_dax_supported(struct super_block *sb, int blocksize) put_dax(dax_dev); if (len < 1) { - pr_err("VFS (%s): error: dax access failed (%ld)\n", + pr_debug("VFS (%s): error: dax access failed (%ld)\n", sb->s_id, len); return len < 0 ? len : -EIO; } @@ -273,9 +273,6 @@ EXPORT_SYMBOL_GPL(dax_copy_from_iter); void arch_wb_cache_pmem(void *addr, size_t size); void dax_flush(struct dax_device *dax_dev, void *addr, size_t size) { - if (unlikely(!dax_alive(dax_dev))) - return; - if (unlikely(!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags))) return; @@ -344,6 +341,9 @@ static struct inode *dax_alloc_inode(struct super_block *sb) struct inode *inode; dax_dev = kmem_cache_alloc(dax_cache, GFP_KERNEL); + if (!dax_dev) + return NULL; + inode = &dax_dev->inode; inode->i_rdev = 0; return inode; |