From 72e811daa161f2a7128f4b1aa85d407deb518608 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 11 Oct 2010 21:14:23 +0200 Subject: [PATCH] --- yaml --- r: 211614 b: refs/heads/master c: b8d0638a98aa4a42ff322234b882487cd74e5c52 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e0a6c4c6e286..96fc8a14a7e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 240634e9b3a8ae2a9e2b7effeea3b9a5b30d68fb +refs/heads/master: b8d0638a98aa4a42ff322234b882487cd74e5c52 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 1ac87f182057..52f9420704c7 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/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);