kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

amiflop,ataflop,xd,mg_disk: clean up unnecessary stuff from block drivers

Browse source 
rq_data_dir() can only be READ or WRITE and rq->sector and nr_sectors
are always automatically updated after partial request completion.
Don't worry about rq_data_dir() not being either READ or WRITE or
manually update sector and nr_sectors.

[ Impact: cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jörg Dorchain <joerg@dorchain.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: unsik Kim <donari75@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Tejun Heo 2009-04-28 13:06:06 +09:00 committed by Jens Axboe
parent 4c94dece1b
commit 5b5c5d12b9
4 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/block/amiflop.c
View file

@ -1371,11 +1371,6 @@ static void redo_fd_request(void)
"0x%08lx\n", track, sector, data);
#endif
if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) {
printk(KERN_WARNING "do_fd_request: unknown command\n");
__blk_end_request_cur(CURRENT, -EIO);
goto repeat;
}
if (get_track(drive, track) == -1) {
__blk_end_request_cur(CURRENT, -EIO);
goto repeat;
@ -1407,8 +1402,6 @@ static void redo_fd_request(void)
break;
}
}
CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
CURRENT->sector += CURRENT->current_nr_sectors;
__blk_end_request_cur(CURRENT, 0);
goto repeat;

4
drivers/block/ataflop.c
View file

@ -732,8 +732,6 @@ static void do_fd_action( int drive )
}
else {
/* all sectors finished */
CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
CURRENT->sector += CURRENT->current_nr_sectors;
__blk_end_request_cur(CURRENT, 0);
redo_fd_request();
return;
@ -1139,8 +1137,6 @@ static void fd_rwsec_done1(int status)
}
else {
/* all sectors finished */
CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
CURRENT->sector += CURRENT->current_nr_sectors;
__blk_end_request_cur(CURRENT, 0);
redo_fd_request();
}

10
drivers/block/mg_disk.c
View file

@ -560,11 +560,6 @@ static void mg_request_poll(struct request_queue *q)
case WRITE:
mg_write(req);
break;
default:
printk(KERN_WARNING "%s:%d unknown command\n",
__func__, __LINE__);
__blk_end_request_cur(req, -EIO);
break;
}
}
}
@ -614,11 +609,6 @@ static unsigned int mg_issue_req(struct request *req,
outb(MG_CMD_WR_CONF, (unsigned long)host->dev_base +
MG_REG_COMMAND);
break;
default:
printk(KERN_WARNING "%s:%d unknown command\n",
__func__, __LINE__);
__blk_end_request_cur(req, -EIO);
break;
}
return MG_ERR_NONE;
}

9
drivers/block/xd.c
View file

@ -308,7 +308,6 @@ static void do_xd_request (struct request_queue * q)
while ((req = elv_next_request(q)) != NULL) {
unsigned block = req->sector;
unsigned count = req->nr_sectors;
int rw = rq_data_dir(req);
XD_INFO *disk = req->rq_disk->private_data;
int res = 0;
int retry;
@ -321,13 +320,9 @@ static void do_xd_request (struct request_queue * q)
__blk_end_request_cur(req, -EIO);
continue;
}
if (rw != READ && rw != WRITE) {
printk("do_xd_request: unknown request\n");
__blk_end_request_cur(req, -EIO);
continue;
}
for (retry = 0; (retry < XD_RETRIES) && !res; retry++)
res = xd_readwrite(rw, disk, req->buffer, block, count);
res = xd_readwrite(rq_data_dir(req), disk, req->buffer,
block, count);
/* wrap up, 0 = success, -errno = fail */
__blk_end_request_cur(req, res);
}