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

Commit e242b094 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Greg Kroah-Hartman
Browse files

rbd: use GFP_NOIO for parent stat and data requests 

commit 1e37f2f84680fa7f8394fd444b6928e334495ccc upstream.

rbd_img_obj_exists_submit() and rbd_img_obj_parent_read_full() are on
the writeback path for cloned images -- we attempt a stat on the parent
object to see if it exists and potentially read it in to call copyup.
GFP_NOIO should be used instead of GFP_KERNEL here.

Link: http://tracker.ceph.com/issues/22014


Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarDavid Disseldorp <ddiss@suse.de>
[idryomov@gmail.com: backport to < 4.9: context]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30651596

drivers/block/rbd.c

+2 −2
Original line number Diff line number Diff line
@@ -2700,7 +2700,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))

		return PTR_ERR(pages);