mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-26 18:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

block shift cleanups and fixes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4912 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2013-07-04 04:26:21 +00:00
parent 6e31fd8306
commit 0043f510cb
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/dev_handlers/scst_tape.c
+3 -3
View File
@@ -166,7 +166,7 @@ static int tape_attach(struct scst_device *dev)
} }
dev->block_size = TAPE_DEF_BLOCK_SIZE; dev->block_size = TAPE_DEF_BLOCK_SIZE;
dev->block_shift = scst_calc_block_shift(dev->block_size); dev->block_shift = -1; /* not used */
buffer = kmalloc(buffer_size, GFP_KERNEL); buffer = kmalloc(buffer_size, GFP_KERNEL);
if (!buffer) { if (!buffer) {
@@ -223,7 +223,7 @@ static int tape_attach(struct scst_device *dev)
res = -ENODEV; res = -ENODEV;
goto out_free_buf; goto out_free_buf;
} }
dev->block_shift = scst_calc_block_shift(dev->block_size); dev->block_shift = -1; /* not used */
obtain: obtain:
res = scst_obtain_device_parameters(dev, NULL); res = scst_obtain_device_parameters(dev, NULL);
@@ -270,7 +270,7 @@ static void tape_set_block_size(struct scst_cmd *cmd, int block_size)
* there are existing commands. * there are existing commands.
*/ */
dev->block_size = block_size; dev->block_size = block_size;
dev->block_shift = scst_calc_block_shift(dev->block_size); dev->block_shift = -1; /* not used */
return; return;
} }
scst/src/dev_handlers/scst_user.c
+11 -2
View File
@@ -1053,7 +1053,7 @@ static void dev_user_set_block_size(struct scst_cmd *cmd, int block_size)
struct scst_user_dev *udev = cmd->dev->dh_priv; struct scst_user_dev *udev = cmd->dev->dh_priv;
dev->block_size = udev->def_block_size; dev->block_size = udev->def_block_size;
} }
dev->block_shift = scst_calc_block_shift(dev->block_size); dev->block_shift = -1; /* not used */
TRACE_EXIT(); TRACE_EXIT();
return; return;
@@ -2591,7 +2591,16 @@ static int dev_user_attach(struct scst_device *sdev)
} }
sdev->block_size = dev->def_block_size; sdev->block_size = dev->def_block_size;
sdev->block_shift = scst_calc_block_shift(sdev->block_size); switch (sdev->type) {
case TYPE_DISK:
case TYPE_ROM:
case TYPE_MOD:
sdev->block_shift = scst_calc_block_shift(sdev->block_size);
break;
default:
sdev->block_shift = -1; /* not used */
break;
}
sdev->dh_priv = dev; sdev->dh_priv = dev;
sdev->tst = dev->tst; sdev->tst = dev->tst;
scst/src/scst_lib.c
+2
View File
@@ -6995,6 +6995,8 @@ static inline int scst_generic_parse(struct scst_cmd *cmd, const int timeout[3])
TRACE_ENTRY(); TRACE_ENTRY();
EXTRACHECKS_BUG_ON(block_shift < 0);
/* /*
* SCST sets good defaults for cmd->data_direction and cmd->bufflen, * SCST sets good defaults for cmd->data_direction and cmd->bufflen,
* therefore change them only if necessary * therefore change them only if necessary
scst/src/scst_targ.c
+2 -1
View File
@@ -1596,7 +1596,8 @@ static int scst_tgt_pre_exec(struct scst_cmd *cmd)
do_zero = true; do_zero = true;
} }
if (do_zero) { if (do_zero) {
if ((cmd->write_len & ((1 << cmd->dev->block_shift) - 1)) == 0) { if (!(cmd->op_flags & SCST_TRANSFER_LEN_TYPE_FIXED) ||
(cmd->write_len & ((1 << cmd->dev->block_shift) - 1)) == 0) {
scst_check_restore_sg_buff(cmd); scst_check_restore_sg_buff(cmd);
scst_zero_write_rest(cmd); scst_zero_write_rest(cmd);
} else { } else {