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

Commit 1c915b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph fix from Sage Weil:
 "This just fixes a few remaining memory allocations in RBD to use
  GFP_NOIO instead of GFP_ATOMIC"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use GFP_NOIO consistently for request allocations
parents d3436a1d 2224d879

drivers/block/rbd.c

+3 −3
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ static struct ceph_osd_request *rbd_osd_req_create( 


	osdc = &rbd_dev->rbd_client->client->osdc;

	osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false,

					  GFP_ATOMIC);

					  GFP_NOIO);

	if (!osd_req)

		return NULL;	/* ENOMEM */
@@ -2002,7 +2002,7 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request) 
	rbd_dev = img_request->rbd_dev;

	osdc = &rbd_dev->rbd_client->client->osdc;

	osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops,

						false, GFP_ATOMIC);

						false, GFP_NOIO);

	if (!osd_req)

		return NULL;	/* ENOMEM */
@@ -2504,7 +2504,7 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request, 
					bio_chain_clone_range(&bio_list,

								&bio_offset,

								clone_size,

								GFP_ATOMIC);

								GFP_NOIO);

			if (!obj_request->bio_list)

				goto out_unwind;

		} else if (type == OBJ_REQUEST_PAGES) {