Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
ide
/
ide-ioctls.c
diff --git
a/kernel/drivers/ide/ide-ioctls.c
b/kernel/drivers/ide/ide-ioctls.c
index
6233fa2
..
d05db24
100644
(file)
--- a/
kernel/drivers/ide/ide-ioctls.c
+++ b/
kernel/drivers/ide/ide-ioctls.c
@@
-125,7
+125,7
@@
static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
if (NULL == (void *) arg) {
struct request *rq;
if (NULL == (void *) arg) {
struct request *rq;
- rq = blk_get_request(drive->queue, READ, __GFP_
WAIT
);
+ rq = blk_get_request(drive->queue, READ, __GFP_
RECLAIM
);
rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
err = blk_execute_rq(drive->queue, NULL, rq, 0);
blk_put_request(rq);
rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
err = blk_execute_rq(drive->queue, NULL, rq, 0);
blk_put_request(rq);
@@
-221,8
+221,8
@@
static int generic_drive_reset(ide_drive_t *drive)
struct request *rq;
int ret = 0;
struct request *rq;
int ret = 0;
- rq = blk_get_request(drive->queue, READ, __GFP_
WAIT
);
- rq->cmd_type = REQ_TYPE_
SPECIAL
;
+ rq = blk_get_request(drive->queue, READ, __GFP_
RECLAIM
);
+ rq->cmd_type = REQ_TYPE_
DRV_PRIV
;
rq->cmd_len = 1;
rq->cmd[0] = REQ_DRIVE_RESET;
if (blk_execute_rq(drive->queue, NULL, rq, 1))
rq->cmd_len = 1;
rq->cmd[0] = REQ_DRIVE_RESET;
if (blk_execute_rq(drive->queue, NULL, rq, 1))