mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-10-22 14:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanups

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@98 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2007-02-22 11:53:35 +00:00
parent 873d818cb8
commit 6e1cb95cce
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_vdisk.c
+30 -28
View File
@@ -211,8 +211,8 @@ static DECLARE_MUTEX(scst_vdisk_mutex);
static LIST_HEAD(vdisk_dev_list); static LIST_HEAD(vdisk_dev_list);
static LIST_HEAD(vcdrom_dev_list); static LIST_HEAD(vcdrom_dev_list);
static struct scst_dev_type disk_devtype_vdisk = VDISK_TYPE; static struct scst_dev_type vdisk_devtype = VDISK_TYPE;
static struct scst_dev_type cdrom_devtype_vdisk = VCDROM_TYPE; static struct scst_dev_type vcdrom_devtype = VCDROM_TYPE;
static char *vdisk_proc_help_string = static char *vdisk_proc_help_string =
"echo \"open|close NAME [FILE_NAME [BLOCK_SIZE] [WRITE_THROUGH " "echo \"open|close NAME [FILE_NAME [BLOCK_SIZE] [WRITE_THROUGH "
@@ -538,11 +538,11 @@ static inline int vdisk_sync_queue_type(enum scst_cmd_queue_type qt)
} }
} }
static inline int vdisk_need_pre_sync(enum scst_cmd_queue_type cwqt, static inline int vdisk_need_pre_sync(enum scst_cmd_queue_type cur,
enum scst_cmd_queue_type lwqt) enum scst_cmd_queue_type last)
{ {
if (vdisk_sync_queue_type(cwqt)) if (vdisk_sync_queue_type(cur))
if (!vdisk_sync_queue_type(lwqt)) if (!vdisk_sync_queue_type(last))
return 1; return 1;
return 0; return 0;
} }
@@ -651,7 +651,7 @@ static int vdisk_do_job(struct scst_cmd *cmd)
case WRITE_10: case WRITE_10:
case WRITE_12: case WRITE_12:
case WRITE_16: case WRITE_16:
fua = (cdb[1] & 0x8) && !virt_dev->wt_flag; fua = (cdb[1] & 0x8);
if (cdb[1] & 0x8) { if (cdb[1] & 0x8) {
TRACE(TRACE_ORDER, "FUA(%d): loff=%Ld, " TRACE(TRACE_ORDER, "FUA(%d): loff=%Ld, "
"data_len=%Ld", fua, (uint64_t)loff, "data_len=%Ld", fua, (uint64_t)loff,
@@ -675,15 +675,14 @@ static int vdisk_do_job(struct scst_cmd *cmd)
case WRITE_12: case WRITE_12:
case WRITE_16: case WRITE_16:
if (likely(!virt_dev->rd_only_flag)) { if (likely(!virt_dev->rd_only_flag)) {
int do_fsync = 0; int do_fsync = vdisk_sync_queue_type(cmd->queue_type);
struct scst_vdisk_tgt_dev *ftgt_dev = struct scst_vdisk_tgt_dev *ftgt_dev =
(struct scst_vdisk_tgt_dev*) (struct scst_vdisk_tgt_dev*)
cmd->tgt_dev->dh_priv; cmd->tgt_dev->dh_priv;
enum scst_cmd_queue_type last_queue_type = enum scst_cmd_queue_type last_queue_type =
ftgt_dev->last_write_cmd_queue_type; ftgt_dev->last_write_cmd_queue_type;
ftgt_dev->last_write_cmd_queue_type = cmd->queue_type; ftgt_dev->last_write_cmd_queue_type = cmd->queue_type;
if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type) && if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type)) {
!virt_dev->wt_flag) {
TRACE(TRACE_ORDER, "ORDERED " TRACE(TRACE_ORDER, "ORDERED "
"WRITE(%d): loff=%Ld, data_len=%Ld", "WRITE(%d): loff=%Ld, data_len=%Ld",
cmd->queue_type, (uint64_t)loff, cmd->queue_type, (uint64_t)loff,
@@ -696,11 +695,12 @@ static int vdisk_do_job(struct scst_cmd *cmd)
blockio_exec_rw(cmd, thr, lba_start, 1); blockio_exec_rw(cmd, thr, lba_start, 1);
else else
vdisk_exec_write(cmd, thr, loff); vdisk_exec_write(cmd, thr, loff);
/* O_SYNC flag is used for wt_flag devices */ /* O_SYNC flag is used for WT devices */
if (do_fsync || fua) if (do_fsync || fua)
vdisk_fsync(thr, loff, data_len, cmd); vdisk_fsync(thr, loff, data_len, cmd);
} else { } else {
TRACE_DBG("%s", "Attempt to write to read-only device"); TRACE(TRACE_MINOR, "Attempt to write to read-only "
"device %s", virt_dev->name);
scst_set_cmd_error(cmd, scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_data_protect)); SCST_LOAD_SENSE(scst_sense_data_protect));
} }
@@ -709,15 +709,14 @@ static int vdisk_do_job(struct scst_cmd *cmd)
case WRITE_VERIFY_12: case WRITE_VERIFY_12:
case WRITE_VERIFY_16: case WRITE_VERIFY_16:
if (likely(!virt_dev->rd_only_flag)) { if (likely(!virt_dev->rd_only_flag)) {
int do_fsync = 0; int do_fsync = vdisk_sync_queue_type(cmd->queue_type);
struct scst_vdisk_tgt_dev *ftgt_dev = struct scst_vdisk_tgt_dev *ftgt_dev =
(struct scst_vdisk_tgt_dev*) (struct scst_vdisk_tgt_dev*)
cmd->tgt_dev->dh_priv; cmd->tgt_dev->dh_priv;
enum scst_cmd_queue_type last_queue_type = enum scst_cmd_queue_type last_queue_type =
ftgt_dev->last_write_cmd_queue_type; ftgt_dev->last_write_cmd_queue_type;
ftgt_dev->last_write_cmd_queue_type = cmd->queue_type; ftgt_dev->last_write_cmd_queue_type = cmd->queue_type;
if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type) && if (vdisk_need_pre_sync(cmd->queue_type, last_queue_type)) {
!virt_dev->wt_flag) {
TRACE(TRACE_ORDER, "ORDERED " TRACE(TRACE_ORDER, "ORDERED "
"WRITE_VERIFY(%d): loff=%Ld, data_len=%Ld", "WRITE_VERIFY(%d): loff=%Ld, data_len=%Ld",
cmd->queue_type, (uint64_t)loff, cmd->queue_type, (uint64_t)loff,
@@ -728,13 +727,14 @@ static int vdisk_do_job(struct scst_cmd *cmd)
} }
/* ToDo: BLOCKIO VERIFY */ /* ToDo: BLOCKIO VERIFY */
vdisk_exec_write(cmd, thr, loff); vdisk_exec_write(cmd, thr, loff);
/* O_SYNC flag is used for wt_flag devices */ /* O_SYNC flag is used for WT devices */
if (cmd->status == 0) if (cmd->status == 0)
vdisk_exec_verify(cmd, thr, loff); vdisk_exec_verify(cmd, thr, loff);
else if (do_fsync) else if (do_fsync)
vdisk_fsync(thr, loff, data_len, cmd); vdisk_fsync(thr, loff, data_len, cmd);
} else { } else {
TRACE_DBG("%s", "Attempt to write to read-only device"); TRACE(TRACE_MINOR, "Attempt to write to read-only "
"device %s", virt_dev->name);
scst_set_cmd_error(cmd, scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_data_protect)); SCST_LOAD_SENSE(scst_sense_data_protect));
} }
@@ -1752,14 +1752,17 @@ static int vdisk_fsync(struct scst_vdisk_thr *thr,
loff_t loff, loff_t len, struct scst_cmd *cmd) loff_t loff, loff_t len, struct scst_cmd *cmd)
{ {
int res = 0; int res = 0;
struct scst_vdisk_dev *virt_dev = thr->virt_dev;
struct file *file = thr->fd; struct file *file = thr->fd;
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_dentry->d_inode;
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
TRACE_ENTRY(); TRACE_ENTRY();
/* ToDo: BLOCKIO fsync() */ /* Hopefully, the compiler will generate the single comparison */
if (thr->virt_dev->nv_cache || thr->virt_dev->blockio) if (virt_dev->nv_cache || virt_dev->blockio || virt_dev->wt_flag ||
virt_dev->rd_only_flag || virt_dev->o_direct_flag ||
virt_dev->nullio)
goto out; goto out;
res = sync_page_range(inode, mapping, loff, len); res = sync_page_range(inode, mapping, loff, len);
@@ -2146,8 +2149,7 @@ static void blockio_exec_rw(struct scst_cmd *cmd, struct scst_vdisk_thr *thr,
bio->bi_bdev = bdev; bio->bi_bdev = bdev;
bio->bi_private = blockio_work; bio->bi_private = blockio_work;
bio->bi_rw |= write; bio->bi_rw |= write;
if (write && virt_dev->wt_flag) bio->bi_rw |= 1 << BIO_RW_SYNC;
bio->bi_rw |= 1 << BIO_RW_SYNC;
if (!hbio) if (!hbio)
hbio = tbio = bio; hbio = tbio = bio;
@@ -2586,7 +2588,7 @@ static int vdisk_write_proc(char *buffer, char **start, off_t offset,
&vdisk_dev_list); &vdisk_dev_list);
virt_dev->virt_id = virt_dev->virt_id =
scst_register_virtual_device(&disk_devtype_vdisk, scst_register_virtual_device(&vdisk_devtype,
virt_dev->name); virt_dev->name);
if (virt_dev->virt_id < 0) { if (virt_dev->virt_id < 0) {
res = virt_dev->virt_id; res = virt_dev->virt_id;
@@ -2708,7 +2710,7 @@ static int vcdrom_open(char *p, char *name)
&vcdrom_dev_list); &vcdrom_dev_list);
virt_dev->virt_id = virt_dev->virt_id =
scst_register_virtual_device(&cdrom_devtype_vdisk, scst_register_virtual_device(&vcdrom_devtype,
virt_dev->name); virt_dev->name);
if (virt_dev->virt_id < 0) { if (virt_dev->virt_id < 0) {
res = virt_dev->virt_id; res = virt_dev->virt_id;
@@ -3155,11 +3157,11 @@ static int __init init_scst_vdisk_driver(void)
goto out; goto out;
} }
res = init_scst_vdisk(&disk_devtype_vdisk); res = init_scst_vdisk(&vdisk_devtype);
if (res != 0) if (res != 0)
goto out_free_slab; goto out_free_slab;
res = init_scst_vdisk(&cdrom_devtype_vdisk); res = init_scst_vdisk(&vcdrom_devtype);
if (res != 0) if (res != 0)
goto out_err; goto out_err;
@@ -3167,7 +3169,7 @@ out:
return res; return res;
out_err: out_err:
exit_scst_vdisk(&disk_devtype_vdisk, &vdisk_dev_list); exit_scst_vdisk(&vdisk_devtype, &vdisk_dev_list);
out_free_slab: out_free_slab:
kmem_cache_destroy(vdisk_thr_cachep); kmem_cache_destroy(vdisk_thr_cachep);
@@ -3176,8 +3178,8 @@ out_free_slab:
static void __exit exit_scst_vdisk_driver(void) static void __exit exit_scst_vdisk_driver(void)
{ {
exit_scst_vdisk(&disk_devtype_vdisk, &vdisk_dev_list); exit_scst_vdisk(&vdisk_devtype, &vdisk_dev_list);
exit_scst_vdisk(&cdrom_devtype_vdisk, &vcdrom_dev_list); exit_scst_vdisk(&vcdrom_devtype, &vcdrom_dev_list);
kmem_cache_destroy(vdisk_thr_cachep); kmem_cache_destroy(vdisk_thr_cachep);
} }