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

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
...@@ -777,9 +777,9 @@ static int rbd_do_request(struct request *rq, ...@@ -777,9 +777,9 @@ static int rbd_do_request(struct request *rq,
ops, ops,
false, false,
GFP_NOIO, pages, bio); GFP_NOIO, pages, bio);
if (IS_ERR(req)) { if (!req) {
up_read(&header->snap_rwsem); up_read(&header->snap_rwsem);
ret = PTR_ERR(req); ret = -ENOMEM;
goto done_pages; goto done_pages;
} }
......
...@@ -470,8 +470,8 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, ...@@ -470,8 +470,8 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
snapc, ops, snapc, ops,
use_mempool, use_mempool,
GFP_NOFS, NULL, NULL); GFP_NOFS, NULL, NULL);
if (IS_ERR(req)) if (!req)
return req; return NULL;
/* calculate max write size */ /* calculate max write size */
calc_layout(osdc, vino, layout, off, plen, req, ops); calc_layout(osdc, vino, layout, off, plen, req, ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment