public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libceph: fix ceph_osdc_alloc_request error checks

Browse source 
ceph_osdc_alloc_request returns NULL on failure.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-05-03 09:23:36 -07:00
parent 8c71897be2
commit 4ad12621e4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/block/rbd.c
View file

@ -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;
} }

4
net/ceph/osd_client.c
View file

@ -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);