Commit ba4fb320 authored by Javier González's avatar Javier González Committed by Christoph Hellwig

nvme: rename bdev operations

Remane block device operations in preparation to add char device file
operations.
Signed-off-by: default avatarJavier González <javier.gonz@samsung.com>
Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f68abd9c
...@@ -2334,7 +2334,7 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len, ...@@ -2334,7 +2334,7 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len,
EXPORT_SYMBOL_GPL(nvme_sec_submit); EXPORT_SYMBOL_GPL(nvme_sec_submit);
#endif /* CONFIG_BLK_SED_OPAL */ #endif /* CONFIG_BLK_SED_OPAL */
static const struct block_device_operations nvme_fops = { static const struct block_device_operations nvme_bdev_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = nvme_ioctl, .ioctl = nvme_ioctl,
.compat_ioctl = nvme_compat_ioctl, .compat_ioctl = nvme_compat_ioctl,
...@@ -3342,7 +3342,7 @@ static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev) ...@@ -3342,7 +3342,7 @@ static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev)
{ {
struct gendisk *disk = dev_to_disk(dev); struct gendisk *disk = dev_to_disk(dev);
if (disk->fops == &nvme_fops) if (disk->fops == &nvme_bdev_ops)
return nvme_get_ns_from_dev(dev)->head; return nvme_get_ns_from_dev(dev)->head;
else else
return disk->private_data; return disk->private_data;
...@@ -3451,7 +3451,7 @@ static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj, ...@@ -3451,7 +3451,7 @@ static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj,
} }
#ifdef CONFIG_NVME_MULTIPATH #ifdef CONFIG_NVME_MULTIPATH
if (a == &dev_attr_ana_grpid.attr || a == &dev_attr_ana_state.attr) { if (a == &dev_attr_ana_grpid.attr || a == &dev_attr_ana_state.attr) {
if (dev_to_disk(dev)->fops != &nvme_fops) /* per-path attr */ if (dev_to_disk(dev)->fops != &nvme_bdev_ops) /* per-path attr */
return 0; return 0;
if (!nvme_ctrl_use_ana(nvme_get_ns_from_dev(dev)->ctrl)) if (!nvme_ctrl_use_ana(nvme_get_ns_from_dev(dev)->ctrl))
return 0; return 0;
...@@ -3904,7 +3904,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, ...@@ -3904,7 +3904,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
if (!disk) if (!disk)
goto out_unlink_ns; goto out_unlink_ns;
disk->fops = &nvme_fops; disk->fops = &nvme_bdev_ops;
disk->private_data = ns; disk->private_data = ns;
disk->queue = ns->queue; disk->queue = ns->queue;
disk->flags = flags; disk->flags = flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment