scsi: osst: remove useless variable assignments in osst_int_ioctl()

PATCH New Gustavo A. R. Silva 1 participant 1 message Jun 27, 2017 SCSI

Share & tools

Gustavo A. R. Silva

author

2017-06-27 22:23 UTC #0 lore raw

PATCH 1/1 scsi: osst: remove useless variable assignments in osst_int_ioctl()

Value assigned to variable blkno at lines 4123:if (blkno >= 0) blkno += arg; and 4127:if (blkno >= 0) blkno -= arg;
is overwritten at line 4131:blkno = STps->drv_block; before it can be used.

This makes such variable assignments useless.

Addresses-Coverity-ID: 1397685

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/scsi/osst.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

drivers/scsi/osst.c +5 -8

index 929ee7e..a62c1f2 100644
@@ -4118,14 +4118,11 @@ static int osst_int_ioctl(struct osst_tape * STp, struct osst_request ** aSRpnt,
 		   printk(OSST_DEB_MSG "%s:D: Skipping %lu blocks %s from logical block %d\n",
 				name, arg, cmd_in==MTFSR?"forward":"backward", logical_blk_num);
 #endif
-		if (cmd_in == MTFSR) {
-		   logical_blk_num += arg;
-		   if (blkno >= 0) blkno += arg;
-		}
-		else {
-		   logical_blk_num -= arg;
-		   if (blkno >= 0) blkno -= arg;
-		}
+		if (cmd_in == MTFSR)
+			logical_blk_num += arg;
+		else
+			logical_blk_num -= arg;
+
 		ioctl_result = osst_seek_logical_blk(STp, &SRpnt, logical_blk_num);
 		fileno = STps->drv_file;
 		blkno  = STps->drv_block;

Signature · 1 line

2.5.0