Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 720fc22a authored by Mikulas Patocka's avatar Mikulas Patocka Committed by David S. Miller
Browse files

ide: Fix IDE taskfile with cfq scheduler 



When ide taskfile access is being used (for example with hdparm --security
commands) and cfq scheduler is selected, the scheduler crashes on BUG in
cfq_put_request.

The reason is that the cfq scheduler is tracking counts of read and write
requests separately; the ide-taskfile subsystem allocates a read request and
then flips the flag to make it a write request. The counters in cfq will
mismatch.

This patch changes ide-taskfile to allocate the READ or WRITE request as
required and don't change the flag later.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1af18503

drivers/ide/ide-taskfile.c

+2 −4
Original line number Diff line number Diff line
@@ -428,13 +428,11 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf, 
{

	struct request *rq;

	int error;

	int rw = !(cmd->tf_flags & IDE_TFLAG_WRITE) ? READ : WRITE;



	rq = blk_get_request(drive->queue, READ, __GFP_WAIT);

	rq = blk_get_request(drive->queue, rw, __GFP_WAIT);

	rq->cmd_type = REQ_TYPE_ATA_TASKFILE;



	if (cmd->tf_flags & IDE_TFLAG_WRITE)

		rq->cmd_flags |= REQ_RW;



	/*

	 * (ks) We transfer currently only whole sectors.

	 * This is suffient for now.  But, it would be great,