nvme: rename bdev operations (ba4fb320) · Commits · 戴 / test

drivers/nvme/host/core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		#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,
		.ioctl = nvme_ioctl,
		.compat_ioctl = nvme_compat_ioctl,
		@@ -3342,7 +3342,7 @@ static inline struct nvme_ns_head dev_to_ns_head(struct device 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;
		else
		return disk->private_data;
		@@ -3451,7 +3451,7 @@ static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj,
		}
		#ifdef CONFIG_NVME_MULTIPATH
		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;
		if (!nvme_ctrl_use_ana(nvme_get_ns_from_dev(dev)->ctrl))
		return 0;
		@@ -3904,7 +3904,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
		if (!disk)
		goto out_unlink_ns;

		disk->fops = &nvme_fops;
		disk->fops = &nvme_bdev_ops;
		disk->private_data = ns;
		disk->queue = ns->queue;
		disk->flags = flags;