mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

nvme: port block device access to file

Browse source 
Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-15-adbd023e19cc@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2024-01-23 14:26:32 +01:00
parent f9d8c3c423
commit e9a7254b03
No known key found for this signature in database
GPG key ID: 91C61BC06578DCA2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/nvme/target/io-cmd-bdev.c
View file

@ -50,10 +50,10 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)
void nvmet_bdev_ns_disable(struct nvmet_ns *ns)
{
if (ns->bdev_handle) {
bdev_release(ns->bdev_handle);
if (ns->bdev_file) {
fput(ns->bdev_file);
ns->bdev = NULL;
ns->bdev_handle = NULL;
ns->bdev_file = NULL;
}
}
@ -85,18 +85,18 @@ int nvmet_bdev_ns_enable(struct nvmet_ns *ns)
if (ns->buffered_io)
return -ENOTBLK;
ns->bdev_handle = bdev_open_by_path(ns->device_path,
ns->bdev_file = bdev_file_open_by_path(ns->device_path,
BLK_OPEN_READ | BLK_OPEN_WRITE, NULL, NULL);
if (IS_ERR(ns->bdev_handle)) {
ret = PTR_ERR(ns->bdev_handle);
if (IS_ERR(ns->bdev_file)) {
ret = PTR_ERR(ns->bdev_file);
if (ret != -ENOTBLK) {
pr_err("failed to open block device %s: (%d)\n",
ns->device_path, ret);
}
ns->bdev_handle = NULL;
ns->bdev_file = NULL;
return ret;
}
ns->bdev = ns->bdev_handle->bdev;
ns->bdev = file_bdev(ns->bdev_file);
ns->size = bdev_nr_bytes(ns->bdev);
ns->blksize_shift = blksize_bits(bdev_logical_block_size(ns->bdev));

2
drivers/nvme/target/nvmet.h
View file

@ -58,7 +58,7 @@
struct nvmet_ns {
struct percpu_ref ref;
struct bdev_handle *bdev_handle;
struct file *bdev_file;
struct block_device *bdev;
struct file *file;
bool readonly;