diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-03 09:23:36 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-05-03 09:28:13 -0700 |
| commit | 4ad12621e442b7a072e81270808f617cb65c5672 (patch) | |
| tree | eecdd1d51f525b9b07c70f8fbcf08c9ede3b8f79 | |
| parent | 8c71897be2ddfd84969412635ca42fa9e137f7b6 (diff) | |
| download | linux-3.10-4ad12621e442b7a072e81270808f617cb65c5672.tar.gz linux-3.10-4ad12621e442b7a072e81270808f617cb65c5672.tar.bz2 linux-3.10-4ad12621e442b7a072e81270808f617cb65c5672.zip | |
libceph: fix ceph_osdc_alloc_request error checks
ceph_osdc_alloc_request returns NULL on failure.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | drivers/block/rbd.c | 4 | ||||
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 16dc3645291..3e904717c1c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -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; } diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 5a80f41c0cb..6b5dda1cb5d 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -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); |