mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 05:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_vdisk: Rework the most recent fix

Browse Source 
Instead of making vdev_open_fd() check the dev_active flag, let the callers
of this function check that flag. This patch does not change the behavior of
the scst_vdisk driver.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9596 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2021-11-22 03:44:44 +00:00
parent 171b1d54e8
commit 47ba05f2a7
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_vdisk.c
+6 -16
View File
@@ -371,13 +371,6 @@ static struct file *vdev_open_fd(const struct scst_vdisk_dev *virt_dev,
sBUG_ON(!name);
if (!virt_dev->dev_active) {
TRACE_MGMT_DBG("Skip opening for not active dev %s",
virt_dev->dev->virt_name);
fd = ERR_PTR(-EMEDIUMTYPE);
goto out;
}
if (read_only)
open_flags |= O_RDONLY;
else
@@ -395,7 +388,6 @@ static struct file *vdev_open_fd(const struct scst_vdisk_dev *virt_dev,
PRINT_ERROR("filp_open(%s) failed: %d", name, (int)PTR_ERR(fd));
}
out:
TRACE_EXIT();
return fd;
}
@@ -1191,7 +1183,7 @@ next:
}
}
if (virt_dev->dif_filename != NULL) {
if (virt_dev->dev_active && virt_dev->dif_filename != NULL) {
/* Check if it can be used */
struct file *dfd = vdev_open_fd(virt_dev, virt_dev->dif_filename,
virt_dev->rd_only);
@@ -1340,19 +1332,17 @@ static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
sBUG_ON(!virt_dev->filename);
sBUG_ON(vdisk_is_open(virt_dev));
if (virt_dev->blockio) {
if (!virt_dev->dev_active) {
TRACE_MGMT_DBG("Skip opening for not active dev %s",
virt_dev->dev->virt_name);
res = -EMEDIUMTYPE;
} else if (virt_dev->blockio) {
virt_dev->bdev_mode = FMODE_READ;
if (!read_only)
virt_dev->bdev_mode |= FMODE_WRITE;
virt_dev->bdev = blkdev_get_by_path(virt_dev->filename,
virt_dev->bdev_mode, (void *)__func__);
res = IS_ERR(virt_dev->bdev) ? PTR_ERR(virt_dev->bdev) : 0;
if ((!virt_dev->dev_active) && (res == -ENOENT))
{
TRACE_MGMT_DBG("Skip opening for not active dev %s",
virt_dev->dev->virt_name);
res = -EMEDIUMTYPE;
}
} else {
virt_dev->fd = vdev_open_fd(virt_dev, virt_dev->filename,
read_only);