Commit ca916599 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.14-rc9' of git://github.com/ceph/ceph-client 

Pull ceph gix from Ilya Dryomov:
 "Memory allocation flags fix, marked for stable"

* tag 'ceph-for-4.14-rc9' of git://github.com/ceph/ceph-client:
  rbd: use GFP_NOIO for parent stat and data requests
parents 60cfc98b 1e37f2f8

drivers/block/rbd.c

+2 −2
Original line number Diff line number Diff line
@@ -2692,7 +2692,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;
@@ -2827,7 +2827,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;