summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-10-11 21:14:23 +0200
committerSage Weil <sage@newdream.net>2010-10-20 15:38:24 -0700
commitb8d0638a98aa4a42ff322234b882487cd74e5c52 (patch)
tree4ab89ab0a293d404466106dd6bced5d68c171ce1 /drivers
parent240634e9b3a8ae2a9e2b7effeea3b9a5b30d68fb (diff)
downloadlwn-b8d0638a98aa4a42ff322234b882487cd74e5c52.tar.gz
lwn-b8d0638a98aa4a42ff322234b882487cd74e5c52.zip
rbd: null vs ERR_PTR
ceph_alloc_page_vector() returns ERR_PTR(-ENOMEM) on errors. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'drivers')
-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 1ac87f182057..52f9420704c7 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -826,8 +826,8 @@ static int rbd_req_sync_op(struct rbd_device *dev,
num_pages = calc_pages_for(ofs , len);
pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);
- if (!pages)
- return -ENOMEM;
+ if (IS_ERR(pages))
+ return PTR_ERR(pages);
if (!orig_ops) {
payload_len = (flags & CEPH_OSD_FLAG_WRITE ? len : 0);