summaryrefslogtreecommitdiffstats
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-03 09:23:36 -0700
committerSage Weil <sage@newdream.net>2011-05-03 09:28:13 -0700
commit4ad12621e442b7a072e81270808f617cb65c5672 (patch)
treeeecdd1d51f525b9b07c70f8fbcf08c9ede3b8f79 /drivers/block/rbd.c
parent8c71897be2ddfd84969412635ca42fa9e137f7b6 (diff)
downloadop-kernel-dev-4ad12621e442b7a072e81270808f617cb65c5672.zip
op-kernel-dev-4ad12621e442b7a072e81270808f617cb65c5672.tar.gz
libceph: fix ceph_osdc_alloc_request error checks
ceph_osdc_alloc_request returns NULL on failure. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r--drivers/block/rbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 16dc364..3e90471 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;
}
OpenPOWER on IntegriCloud