diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-29 12:41:41 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-29 12:41:41 -0500 |
| commit | a207140b24b721e45107c9ba9b11cd3b813d517e (patch) | |
| tree | 0e3207da9454f44c23c8fbfc23bef4c8ee186ac0 /drivers/block | |
| parent | 90a44e3e7d9e94f96d8d6c2f70789f8eeb594ca8 (diff) | |
| parent | 9b609ba2c2df8290054e5c62be69101b43e2a976 (diff) | |
Merge tag 'v4.9.62' into v4.9-rt
This is the 4.9.62 stable release
Conflicts:
include/linux/preempt.h
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 7b274ff4632c..24f4b544d270 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2788,7 +2788,7 @@ static int rbd_img_obj_parent_read_full(struct rbd_obj_request *obj_request) * from the parent. */ page_count = (u32)calc_pages_for(0, length); - pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); + pages = ceph_alloc_page_vector(page_count, GFP_NOIO); if (IS_ERR(pages)) { result = PTR_ERR(pages); pages = NULL; @@ -2922,7 +2922,7 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) */ size = sizeof (__le64) + sizeof (__le32) + sizeof (__le32); page_count = (u32)calc_pages_for(0, size); - pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); + pages = ceph_alloc_page_vector(page_count, GFP_NOIO); if (IS_ERR(pages)) { ret = PTR_ERR(pages); goto fail_stat_request; |