projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: drm/rockchip: vop: merge vop cfg_done into vop_data
[firefly-linux-kernel-4.4.55.git]
/
block
/
scsi_ioctl.c
diff --git
a/block/scsi_ioctl.c
b/block/scsi_ioctl.c
index dda653ce7b24cfb959f668bdb4a676900ed7637d..0774799942e06a8d890a5c88e40990cd53a15037 100644
(file)
--- a/
block/scsi_ioctl.c
+++ b/
block/scsi_ioctl.c
@@
-444,7
+444,7
@@
int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
}
}
- rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_
WAIT
);
+ rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_
RECLAIM
);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
goto error_free_buffer;
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
goto error_free_buffer;
@@
-495,7
+495,7
@@
int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
break;
}
break;
}
- if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, __GFP_
WAIT
)) {
+ if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, __GFP_
RECLAIM
)) {
err = DRIVER_ERROR << 24;
goto error;
}
err = DRIVER_ERROR << 24;
goto error;
}
@@
-536,7
+536,7
@@
static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
struct request *rq;
int err;
struct request *rq;
int err;
- rq = blk_get_request(q, WRITE, __GFP_
WAIT
);
+ rq = blk_get_request(q, WRITE, __GFP_
RECLAIM
);
if (IS_ERR(rq))
return PTR_ERR(rq);
blk_rq_set_block_pc(rq);
if (IS_ERR(rq))
return PTR_ERR(rq);
blk_rq_set_block_pc(rq);