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

Commit 4ad12621 authored by Sage Weil's avatar Sage Weil
Browse files

libceph: fix ceph_osdc_alloc_request error checks 



ceph_osdc_alloc_request returns NULL on failure.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 8c71897b

drivers/block/rbd.c

+2 −2
Original line number Diff line number Diff line
@@ -777,9 +777,9 @@ static int rbd_do_request(struct request *rq, 
				      ops,

				      false,

				      GFP_NOIO, pages, bio);

	if (IS_ERR(req)) {

	if (!req) {

		up_read(&header->snap_rwsem);

		ret = PTR_ERR(req);

		ret = -ENOMEM;

		goto done_pages;

	}

net/ceph/osd_client.c

+2 −2
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 
					 snapc, ops,

					 use_mempool,

					 GFP_NOFS, NULL, NULL);

	if (IS_ERR(req))

		return req;

	if (!req)

		return NULL;



	/* calculate max write size */

	calc_layout(osdc, vino, layout, off, plen, req, ops);